diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 2141997..9194d73 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -464,6 +464,8 @@
 }
 
 void Dbg::StopJdwp() {
+  // Prevent the JDWP thread from processing JDWP incoming packets after we close the connection.
+  Disposed();
   delete gJdwpState;
   gJdwpState = NULL;
   delete gRegistry;