diff --git a/src/core/gdb_server.cpp b/src/core/gdb_server.cpp
index 50dbf3e73..aebbfe3ba 100644
--- a/src/core/gdb_server.cpp
+++ b/src/core/gdb_server.cpp
@@ -547,6 +547,7 @@ void GDBServer::Shutdown()
   }
 
   INFO_LOG("Stopping GDB server.");
+  s_gdb_listen_socket->Close();
   s_gdb_listen_socket.reset();
   System::ReleaseSocketMultiplexer();
 }
diff --git a/src/core/pine_server.cpp b/src/core/pine_server.cpp
index 569095c41..1112ef839 100644
--- a/src/core/pine_server.cpp
+++ b/src/core/pine_server.cpp
@@ -178,6 +178,7 @@ void PINEServer::Shutdown()
   // also closes the listener
   if (s_listen_socket)
   {
+    s_listen_socket->Close();
     s_listen_socket.reset();
     System::ReleaseSocketMultiplexer();
   }