diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index c054385e4..27fff2d84 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -490,8 +490,11 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data)
     uint32 count;
     recv_data >> count;                                     // quest count, max=25
 
-    if(count >= MAX_QUEST_LOG_SIZE)
+    if(count > MAX_QUEST_LOG_SIZE)
+    {
+        recv_data.rpos(recv_data.wpos());                   // set to end to avoid warnings spam
         return;
+    }
 
     WorldPacket data(SMSG_QUEST_POI_QUERY_RESPONSE, 4+(4+4)*count);
     data << uint32(count);                                  // count
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index d03bab030..0b5d8bacb 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9217"
+ #define REVISION_NR "9218"
 #endif // __REVISION_NR_H__