diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 449f7235..26c21264 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -1224,10 +1224,12 @@ void Profiler::Worker()
                 keepAlive = 0;
             }
 
-            while( m_sock->HasData() )
+            bool connActive = true;
+            while( m_sock->HasData() && connActive )
             {
-                if( !HandleServerQuery() ) break;
+                connActive = HandleServerQuery();
             }
+            if( !connActive ) break;
         }
         if( ShouldExit() ) break;