diff --git a/NetKVM/ProtocolService/ProtocolService.cpp b/NetKVM/ProtocolService/ProtocolService.cpp
index 1fe3ddeb..12131644 100644
--- a/NetKVM/ProtocolService/ProtocolService.cpp
+++ b/NetKVM/ProtocolService/ProtocolService.cpp
@@ -704,6 +704,10 @@ protected:
     {
         StopThread();
         m_ThreadEvent.Set();
+        while (IsThreadRunning())
+        {
+            Sleep(50);
+        }
         return true;
     }
     virtual void ThreadProc()