diff --git a/server/CQuery.cpp b/server/CQuery.cpp
index dfa0c8848..1d0a7d7b3 100644
--- a/server/CQuery.cpp
+++ b/server/CQuery.cpp
@@ -176,7 +176,7 @@ void CObjectVisitQuery::onExposure(QueryPtr topQuery)
 	if(gh->isValidObject(visitedObject))
 		topQuery->notifyObjectAboutRemoval(*this);
 
-	owner->popQuery(*this);
+	owner->popIfTop(*this);
 }
 
 void Queries::popQuery(PlayerColor player, QueryPtr query)