diff --git a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
index 3c4a489..94475a9 100644
--- a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
+++ b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
@@ -213,7 +213,8 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
                     for (String serverId : getServerIds()) {
                         Set<String> players = jedis.smembers("proxy:" + serverId + ":usersOnline");
                         for (String player : players) {
-                            builder.put(serverId, UUID.fromString(player));
+
+                            builder.put(jedis.hget("player:" + player, "server"), UUID.fromString(player));
                         }
                     }
                     return builder.build();
@@ -225,7 +226,7 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
                     for (String serverId : getServerIds()) {
                         Set<String> players = jedisCluster.smembers("proxy:" + serverId + ":usersOnline");
                         for (String player : players) {
-                            builder.put(serverId, UUID.fromString(player));
+                            builder.put(jedisCluster.hget("player:" + player, "server"), UUID.fromString(player));
                         }
                     }
                     return builder.build();
diff --git a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java
index 9f9743c..56b4183 100644
--- a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java
+++ b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java
@@ -377,7 +377,7 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player> {
                     for (String serverId : getServerIds()) {
                         Set<String> players = jedis.smembers("proxy:" + serverId + ":usersOnline");
                         for (String player : players) {
-                            builder.put(serverId, UUID.fromString(player));
+                            builder.put(jedis.hget("player:" + player, "server"), UUID.fromString(player));
                         }
                     }
                     return builder.build();
@@ -389,7 +389,7 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player> {
                     for (String serverId : getServerIds()) {
                         Set<String> players = jedisCluster.smembers("proxy:" + serverId + ":usersOnline");
                         for (String player : players) {
-                            builder.put(serverId, UUID.fromString(player));
+                            builder.put(jedisCluster.hget("player:" + player, "server"), UUID.fromString(player));
                         }
                     }
                     return builder.build();