diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp
index 7e74d0f11..35ef5fcbb 100644
--- a/Source/Contents/ClientState.cpp
+++ b/Source/Contents/ClientState.cpp
@@ -1058,7 +1058,8 @@ std::uint32_t CSession::ReadReplayEntryQueue(const std::vector<unsigned char>& d
       int queueId = 0;
       std::memcpy(&queueId, data.data() + offset, header.bytes);
       offset += header.bytes;
-      for (std::map<unsigned int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != g_entryQueueList.end(); ++it) {
+      const std::map<unsigned int, EntryQueueInfo*>::iterator end = g_entryQueueList.end();
+      for (std::map<unsigned int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != end; ++it) {
         if (queueId == it->second->id) {
           g_entryQueueMgr->current = it->second;
         }