diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 2a868ff6d..6932070cd 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -166,7 +166,8 @@ def start():
             if not checkConnection() or not checkString() or not checkRegexp():
                 continue
 
-            checkNullConnection()
+            if conf.useNullConnection:
+                checkNullConnection()
 
             if not conf.dropSetCookie:
                 for _, cookie in enumerate(conf.cj):
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 699d8ecf8..1f37c64f4 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -464,6 +464,9 @@ def cmdLineParser():
         parser.add_option("--common-prediction", dest="useCommonPrediction", action="store_true",
                           help=SUPPRESS_HELP)
 
+        parser.add_option("--null-connection", dest="useNullConnection", action="store_true",
+                          help=SUPPRESS_HELP)
+
         parser.add_option("--smoke-test", dest="smokeTest", action="store_true",
                           help=SUPPRESS_HELP)