diff --git a/server.cpp b/server.cpp
index 7be5236e..ad505ad6 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1035,7 +1035,8 @@ void S9xNPServerLoop (void *)
 #ifdef NP_DEBUG
     printf ("SERVER: Server thread exiting @%ld\n", S9xGetMilliTime () - START);
 #endif
-    S9xNPStopServer ();
+    // OV2: S9xNPStopServer has already been called if we get here
+    // S9xNPStopServer ();
 }
 
 bool8 S9xNPStartServer (int port)