diff --git a/common/src/main/java/me/william278/husksync/proxy/data/DataManager.java b/common/src/main/java/me/william278/husksync/proxy/data/DataManager.java
index 9e3c73e6..c271b7d1 100644
--- a/common/src/main/java/me/william278/husksync/proxy/data/DataManager.java
+++ b/common/src/main/java/me/william278/husksync/proxy/data/DataManager.java
@@ -341,8 +341,9 @@ public class DataManager {
             // Remove the old data if it exists
             PlayerData oldData = null;
             for (PlayerData data : playerData) {
-                if (data.getPlayerUUID() == newData.getPlayerUUID()) {
+                if (data.getPlayerUUID().equals(newData.getPlayerUUID())) {
                     oldData = data;
+                    break;
                 }
             }
             if (oldData != null) {
@@ -361,7 +362,7 @@ public class DataManager {
          */
         public PlayerData getPlayer(UUID playerUUID) {
             for (PlayerData data : playerData) {
-                if (data.getPlayerUUID() == playerUUID) {
+                if (data.getPlayerUUID().equals(playerUUID)) {
                     return data;
                 }
             }