diff --git a/src/Config.py b/src/Config.py
index 06e70486..69ccaaf7 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -179,7 +179,6 @@ class Config(object):
         self.parser.add_argument('--debug', help='Debug mode', action='store_true')
         self.parser.add_argument('--silent', help='Disable logging to terminal output', action='store_true')
         self.parser.add_argument('--debug_socket', help='Debug socket connections', action='store_true')
-        self.parser.add_argument('--debug_gevent', help='Debug gevent functions', action='store_true')
 
         self.parser.add_argument('--batch', help="Batch mode (No interactive input for commands)", action='store_true')
 
diff --git a/src/Debug/Debug.py b/src/Debug/Debug.py
index 3d6b6394..960d260c 100644
--- a/src/Debug/Debug.py
+++ b/src/Debug/Debug.py
@@ -46,20 +46,19 @@ def formatStack():
 
 
 # Test if gevent eventloop blocks
-if config.debug_gevent:
-    import logging
-    import gevent
-    import time
+import logging
+import gevent
+import time
 
-    def testBlock():
-        logging.debug("Gevent block checker started")
+def testBlock():
+    logging.debug("Gevent block checker started")
+    last_time = time.time()
+    while 1:
+        time.sleep(1)
+        if time.time() - last_time > 1.1:
+            logging.debug("Gevent block detected: %s" % (time.time() - last_time - 1))
         last_time = time.time()
-        while 1:
-            time.sleep(1)
-            if time.time() - last_time > 1.1:
-                logging.debug("Gevent block detected: %s" % (time.time() - last_time - 1))
-            last_time = time.time()
-    gevent.spawn(testBlock)
+gevent.spawn(testBlock)
 
 
 if __name__ == "__main__":