diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
index 13284b993..e36bafe8c 100644
--- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
@@ -470,7 +470,12 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     // Find if the line contains the player we want.
                     String[] character = line.split(":");
 
-                    if ((uuid != null && (!character[41].equalsIgnoreCase(uuid.toString()) && !character[41].equalsIgnoreCase("NULL"))) || (uuid == null && !character[0].equalsIgnoreCase(playerName))) {
+                    // Compare names because we don't have a valid uuid for that player even if input uuid is not null
+                    if (character[41].equalsIgnoreCase("NULL") && !character[0].equalsIgnoreCase(playerName)) {
+                        continue;
+                    }
+                    // If input uuid is not null then we should compare uuids
+                    else if ((uuid != null && !character[41].equalsIgnoreCase(uuid.toString())) || (!character[0].equalsIgnoreCase(playerName))) {
                         continue;
                     }