diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp
index 0f45e18d1..2401aa351 100644
--- a/Source/Contents/ClientState.cpp
+++ b/Source/Contents/ClientState.cpp
@@ -1054,7 +1054,7 @@ 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<int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != g_entryQueueList.end(); ++it) {
+      for (std::map<unsigned int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != g_entryQueueList.end(); ++it) {
         if (queueId == it->second->id) {
           g_entryQueueMgr->current = it->second;
         }
diff --git a/Source/Contents/EntryQueue/EntryQueueMgr.cpp b/Source/Contents/EntryQueue/EntryQueueMgr.cpp
index c278591f3..03a01a6fb 100644
--- a/Source/Contents/EntryQueue/EntryQueueMgr.cpp
+++ b/Source/Contents/EntryQueue/EntryQueueMgr.cpp
@@ -37,10 +37,10 @@ struct EntryQueueNamePacket {
 // GLOBAL: gl_24868
 CEntryQueueMgr* g_entryQueueMgr;
 // GLOBAL: gl_24869
-std::map<int, EntryQueueInfo*> g_entryQueueList;
+std::map<unsigned int, EntryQueueInfo*> g_entryQueueList;
 
 CEntryQueueMgr::~CEntryQueueMgr() {
-  for (std::map<int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != g_entryQueueList.end(); ++it) {
+  for (std::map<unsigned int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != g_entryQueueList.end(); ++it) {
     if (it->second) {
       delete it->second;
     }
diff --git a/Source/Contents/EntryQueue/EntryQueueMgr.h b/Source/Contents/EntryQueue/EntryQueueMgr.h
index 702e340f2..d0a278bf6 100644
--- a/Source/Contents/EntryQueue/EntryQueueMgr.h
+++ b/Source/Contents/EntryQueue/EntryQueueMgr.h
@@ -86,7 +86,7 @@ public:
 };
 
 extern CEntryQueueMgr* g_entryQueueMgr;
-extern std::map<int, EntryQueueInfo*> g_entryQueueList;
+extern std::map<unsigned int, EntryQueueInfo*> g_entryQueueList;
 
 bool CreateEntryQueueMgr();
 void DestroyEntryQueueMgr();
diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp
index 19fa2c799..e3973e759 100644
--- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp
+++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp
@@ -375,12 +375,12 @@ void UIEntryQueueWnd::OnCreate(int width, int height) {
   this->m_list->backgroundBlue = 240;
   this->AddChild(this->m_list);
 
-  const std::map<int, EntryQueueInfo*>::iterator end = g_entryQueueList.end();
-  for (std::map<int, EntryQueueInfo*>::iterator it = g_entryQueueList.begin(); it != 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) {
     this->m_list->AddEntry(it->second->displayName, it->second->id);
   }
 
-  std::map<int, EntryQueueInfo*>::iterator first = g_entryQueueList.begin();
+  std::map<unsigned int, EntryQueueInfo*>::iterator first = g_entryQueueList.begin();
   g_entryQueueMgr->current = first->second;
 
   const char* labels[7] = {
@@ -549,7 +549,7 @@ int UIEntryQueueWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std
   case UM_LIST_SELECTION:
     if (this->m_list) {
       const int value = this->m_list->EntryValue(static_cast<int>(b));
-      std::map<int, EntryQueueInfo*>::iterator it = g_entryQueueList.find(value);
+      std::map<unsigned int, EntryQueueInfo*>::iterator it = g_entryQueueList.find(value);
       if (it != g_entryQueueList.end() && it->second) {
         this->SelectQueue(it->second);
       }