diff --git a/src/GUI/MPServersModel.cpp b/src/GUI/MPServersModel.cpp
index a0cc64b54..f549d9d23 100644
--- a/src/GUI/MPServersModel.cpp
+++ b/src/GUI/MPServersModel.cpp
@@ -181,7 +181,7 @@ QString MPServersModel::currentServer() const
         return (m_currentIndex == 1) ? "__custom__" : "__noservers__";
     }
 
-    if (m_currentIndex == m_servers.size()) {
+    if (static_cast<std::vector<MPServersModel::ServerInfo>::size_type>(m_currentIndex) == m_servers.size()) {
         return "__custom__";
     }
 
diff --git a/src/GUI/MPServersModel.h b/src/GUI/MPServersModel.h
index 8f850ba62..d07267734 100644
--- a/src/GUI/MPServersModel.h
+++ b/src/GUI/MPServersModel.h
@@ -66,7 +66,7 @@ private:
     };
 
     std::vector<ServerInfo> m_servers;
-    unsigned int m_currentIndex = 0;
+    int m_currentIndex = 0;
 };
 
 #endif // MPSERVERSMODEL_H