diff --git a/Src/BeebWin.cpp b/Src/BeebWin.cpp
index 689e27e9..b1d0a72b 100644
--- a/Src/BeebWin.cpp
+++ b/Src/BeebWin.cpp
@@ -5509,7 +5509,7 @@ void BeebWin::GdbStartServer()
 	static GdbServer gdbServer(/*Simulation controller =*/&simControl, /*tcp port=*/51000);
 
 	if (serverStarted == false) {
-		std::thread gdbThread(&GdbServer::serverThread, gdbServer);
+		static std::thread gdbThread(&GdbServer::serverThread, gdbServer);
 	}
 }