diff --git a/common/TracyProtocol.hpp b/common/TracyProtocol.hpp
index 35b98342..8e58cb61 100644
--- a/common/TracyProtocol.hpp
+++ b/common/TracyProtocol.hpp
@@ -36,6 +36,7 @@ enum { WelcomeMessageHostInfoSize = 1024 };
 
 #pragma pack( 1 )
 
+// Must increase left query space after handling!
 enum ServerQuery : uint8_t
 {
     ServerQueryTerminate,
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index 384f9bab..1c9d5f0f 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -2828,6 +2828,7 @@ bool Worker::DispatchProcess( const QueueItem& ev, const char*& ptr )
                 break;
             case QueueType::SymbolCode:
                 AddSymbolCode( ev.stringTransfer.ptr, ptr, sz );
+                m_serverQuerySpaceLeft++;
                 break;
             default:
                 assert( false );
@@ -2872,6 +2873,7 @@ bool Worker::DispatchProcess( const QueueItem& ev, const char*& ptr )
                 break;
             case QueueType::ExternalName:
                 AddExternalName( ev.stringTransfer.ptr, ptr, sz );
+                m_serverQuerySpaceLeft++;
                 break;
             case QueueType::ExternalThreadName:
                 AddExternalThreadName( ev.stringTransfer.ptr, ptr, sz );
@@ -3765,6 +3767,7 @@ bool Worker::Process( const QueueItem& ev )
         break;
     case QueueType::SymbolInformation:
         ProcessSymbolInformation( ev.symbolInformation );
+        m_serverQuerySpaceLeft++;
         break;
     case QueueType::Terminate:
         m_terminate = true;