diff --git a/Lobby/src/main/java/de/fanta/lobby/commands/PiglinCommand/HangableDataPiglinCommand.java b/Lobby/src/main/java/de/fanta/lobby/commands/PiglinCommand/HangableDataPiglinCommand.java
index 47580f1..18c6f70 100644
--- a/Lobby/src/main/java/de/fanta/lobby/commands/PiglinCommand/HangableDataPiglinCommand.java
+++ b/Lobby/src/main/java/de/fanta/lobby/commands/PiglinCommand/HangableDataPiglinCommand.java
@@ -14,6 +14,7 @@
 import org.bukkit.util.RayTraceResult;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 public class HangableDataPiglinCommand extends SubCommand {
@@ -50,6 +51,9 @@
 
         switch (argsNext) {
             case "enabled" -> {
+                if (!args.hasNext()) {
+                    return false;
+                }
                 Boolean isHangable = args.getNext(false);
                 if (isHangable == null) {
                     return false;
@@ -121,7 +125,19 @@
 
     @Override
     public Collection<String> onTabComplete(CommandSender sender, Command command, String alias, ArgsParser args) {
-        return List.of("true", "false");
+        args.next();
+        if (!args.hasNext()) {
+            return plugin.getEntityData().keySet();
+        }
+        String enabled = args.getNext();
+        if (!args.hasNext()) {
+            return List.of("enabled", "fenceLocation", "onlineBlockLocation", "offlineBlockLocation");
+        }
+        args.next();
+        if (enabled.equalsIgnoreCase("enabled")) {
+            return List.of("true", "false");
+        }
+        return Collections.emptyList();
     }
 
     @Override