diff --git a/src/main/java/fr/xephi/authme/util/message/I18NUtils.java b/src/main/java/fr/xephi/authme/util/message/I18NUtils.java
index da519267..ff68b5ab 100644
--- a/src/main/java/fr/xephi/authme/util/message/I18NUtils.java
+++ b/src/main/java/fr/xephi/authme/util/message/I18NUtils.java
@@ -45,18 +45,11 @@ public class I18NUtils {
     public static String getLocale(Player player) {
         if (Utils.MAJOR_VERSION > 15) {
             return player.getLocale().toLowerCase();
-        } else {
-            long startTime = System.currentTimeMillis();
-            for (;;) {
-                if (PLAYER_LOCALE.containsKey(player.getUniqueId())) {
-                    return PLAYER_LOCALE.get(player.getUniqueId());
-                }
-
-                if (System.currentTimeMillis() - startTime  > 500) {
-                    return null;
-                }
-            }
+        } else if (PLAYER_LOCALE.containsKey(player.getUniqueId())) {
+            return PLAYER_LOCALE.get(player.getUniqueId());
         }
+
+        return null;
     }
 
     public static void addLocale(UUID uuid, String locale) {