diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp
index 09b8c1c0b..f20d90518 100644
--- a/renderdoc/core/remote_server.cpp
+++ b/renderdoc/core/remote_server.cpp
@@ -676,8 +676,10 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volati
     }
   }
 
-  if(activeClientData && activeClientData->socket == NULL)
+  if(activeClientData && activeClientData->socket != NULL)
   {
+    activeClientData->killThread = true;
+
     Threading::JoinThread(activeClientData->thread);
     Threading::CloseThread(activeClientData->thread);