diff --git a/pydevd.py b/pydevd.py
index d25b0f8d68..7d3541a2b3 100644
--- a/pydevd.py
+++ b/pydevd.py
@@ -462,6 +462,9 @@ def processInternalCommands(self):
                     if isinstance(t, PyDBDaemonThread):
                         pydev_log.error_once('Found PyDBDaemonThread in threading.enumerate.')
                         
+                    elif getattr(t, 'is_pydev_daemon_thread', False):
+                        pass # I.e.: skip the DummyThreads created from pydev daemon threads
+                        
                     elif isThreadAlive(t):
                         program_threads_alive[thread_id] = t
 
diff --git a/pydevd_comm.py b/pydevd_comm.py
index 0025ae5fe4..9a3d9eb01c 100644
--- a/pydevd_comm.py
+++ b/pydevd_comm.py
@@ -263,6 +263,8 @@ def start(self):
     def run(self):
         created_pydb_daemon = self.created_pydb_daemon_threads
         created_pydb_daemon[self] = 1
+        dummy_thread = threading.currentThread()
+        dummy_thread.is_pydev_daemon_thread = True
         try:
             try:
                 if IS_JYTHON: