diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index e03a7046..87b633f8 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -1728,6 +1728,7 @@ void Worker::Exec()
         }
     }
 
+    m_serverQuerySpaceLeft = m_sock.GetSendBufSize() / ServerQueryPacketSize;
     m_hasData.store( true, std::memory_order_release );
 
     LZ4_setStreamDecode( m_stream, nullptr, 0 );
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index 28619c37..630a0476 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -12,6 +12,7 @@
 #include "../common/TracyForceInline.hpp"
 #include "../common/TracyMutex.hpp"
 #include "../common/TracyQueue.hpp"
+#include "../common/TracyProtocol.hpp"
 #include "../common/TracySocket.hpp"
 #include "tracy_flat_hash_map.hpp"
 #include "TracyEvent.hpp"
@@ -513,6 +514,9 @@ private:
     FailureData m_failureData;
 
     PlotData* m_sysTimePlot = nullptr;
+
+    Vector<ServerQueryPacket> m_serverQueryQueue;
+    size_t m_serverQuerySpaceLeft;
 };
 
 }