diff --git a/pydevd.py b/pydevd.py
index 36102b9f..d2f7c02e 100644
--- a/pydevd.py
+++ b/pydevd.py
@@ -724,6 +724,8 @@ def __init__(self, set_as_global=True):
 
         self._local_thread_trace_func = threading.local()
 
+        self._client_socket = None
+
         self._server_socket_ready_event = ThreadingEvent()
         self._server_socket_name = None
 
@@ -1501,6 +1503,7 @@ def initialize_network(self, sock, terminate_on_socket_close=True):
     def connect(self, host, port):
         if host:
             s = start_client(host, port)
+            self._client_socket = s
         else:
             s = start_server(port)
 
@@ -2547,6 +2550,10 @@ def dispose_and_kill_all_pydevd_threads(self, wait=True, timeout=0.5):
             except:
                 pass
         finally:
+            if self._client_socket:
+                self._client_socket.close()
+                self._client_socket = None
+
             pydev_log.debug("PyDB.dispose_and_kill_all_pydevd_threads: finished")
 
     def prepare_to_run(self):