diff --git a/etc/tor/torrc-client b/etc/tor/torrc-client
index 622b2ae8..6833cbd5 100644
--- a/etc/tor/torrc-client
+++ b/etc/tor/torrc-client
@@ -22,7 +22,16 @@ ClientUseIPv6 1
 # in a DS network preventing Tor over IPv4.
 #ClientPreferIPv6ORPort 1
 
-# The default ControlPort is 9051 which is presumably used by the main Tor
-# instance.
-ControlPort 9052
+# Disable control access
+ControlPort 0
+ControlSocket 0
+
+# If these have been disabled in the main Tor or OneHopOnion and something
+# should work with the Debian defaults (e.g. zeronet)
 CookieAuthentication 1
+#CookieAuthFileGroupReadable 1
+#CookieAuthFile /run/tor/control.authcookie
+#ControlPort 9051
+#ControlSocket /run/tor/control GroupWritable RelaxDirModeCheck
+#ControlSocketsGroupWritable 1
+#SocksPort unix:/run/tor/socks WorldWritable IsolateDestAddr PreferIPv6
diff --git a/etc/tor/torrc-onehoponion b/etc/tor/torrc-onehoponion
index 68fa98b3..09698893 100644
--- a/etc/tor/torrc-onehoponion
+++ b/etc/tor/torrc-onehoponion
@@ -6,6 +6,10 @@ SyslogIdentityTag onehoponion
 SocksPort 0
 HiddenServiceSingleHopMode 1
 HiddenServiceNonAnonymousMode 1
-
-ControlPort 9053
 CookieAuthentication 1
+
+# I think hidden services running in this mode should be controlled only by
+# me in this file so services like Zeronet or Ricochet don't accidentally
+# create NonAnonymous hidden services
+ControlPort 0
+ControlSocket 0