diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index 38841221..76815c3a 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -486,6 +486,10 @@ void GameHandler::disconnect() {
     contacts_.clear();
     transportAttachments_.clear();
     serverUpdatedTransportGuids_.clear();
+    // Clear in-flight query sets so reconnect can re-issue queries for any
+    // entries whose responses were lost during the disconnect.
+    pendingCreatureQueries.clear();
+    pendingGameObjectQueries_.clear();
     requiresWarden_ = false;
     wardenGateSeen_ = false;
     wardenGateElapsed_ = 0.0f;