diff --git a/proxy/src/main/java/com/velocitypowered/proxy/server/ServerMap.java b/proxy/src/main/java/com/velocitypowered/proxy/server/ServerMap.java
index 357c97e95..247b5ebfe 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/server/ServerMap.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/server/ServerMap.java
@@ -7,10 +7,11 @@ import com.velocitypowered.api.proxy.server.ServerInfo;
 import com.velocitypowered.proxy.VelocityServer;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ServerMap {
     private final VelocityServer server;
-    private final Map<String, RegisteredServer> servers = new HashMap<>();
+    private final Map<String, RegisteredServer> servers = new ConcurrentHashMap<>();
 
     public ServerMap(VelocityServer server) {
         this.server = server;