diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java
index 2214cdd..308f5ef 100644
--- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java
+++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java
@@ -74,6 +74,9 @@ public class Key extends SubCommand {
 
     @Override
     public List<String> getTabComplete(CommandSender commandSender, String[] args) {
+        if (args.length > 1) {
+            return List.of();
+        }
         return Config.KEY.CRATES.keySet().stream().toList();
     }
 
diff --git a/src/main/java/com/alttd/playerutils/config/KeyStorage.java b/src/main/java/com/alttd/playerutils/config/KeyStorage.java
index cec736f..4190b67 100644
--- a/src/main/java/com/alttd/playerutils/config/KeyStorage.java
+++ b/src/main/java/com/alttd/playerutils/config/KeyStorage.java
@@ -49,6 +49,7 @@ public class KeyStorage extends AbstractConfig {
                 List<UUID> uuids = configurationSection.getKeys(false).stream().map(UUID::fromString).toList();
                 if (uuids.isEmpty()) {
                     config.logger.info(String.format("No keys yet for crate %s", crate));
+                    KEYS.put(crate, count);
                     continue;
                 }
                 for (UUID uuid : uuids) {