diff --git a/src/ptvsd/server/api.py b/src/ptvsd/server/api.py
index 03cc0d40..e5b82b57 100644
--- a/src/ptvsd/server/api.py
+++ b/src/ptvsd/server/api.py
@@ -123,8 +123,10 @@ def enable_attach(dont_trace_start_patterns, dont_trace_end_patterns):
 
         # Adapter life time is expected to be longer than this process,
         # so never wait on the adapter process
-        # TODO: Add adapter PID to ignore list https://github.com/microsoft/ptvsd/issues/1786
-        subprocess.Popen(adapter_args, bufsize=0)
+        process = subprocess.Popen(adapter_args, bufsize=0)
+        # Ensure that we ignore the adapter process when terminating the
+        # debugger. 
+        pydevd.add_dont_terminate_child_pid(process.pid)
 
     server_opts.port = port_queue.get(True, _QUEUE_TIMEOUT)