diff --git a/common/src/main/java/com/viaversion/viaversion/commands/ViaCommandHandler.java b/common/src/main/java/com/viaversion/viaversion/commands/ViaCommandHandler.java
index 6496c7280..868111179 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/ViaCommandHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/ViaCommandHandler.java
@@ -125,7 +125,15 @@ public abstract class ViaCommandHandler implements ViaVersionCommand {
 
                 List<String> tab = sub.onTabComplete(sender, subArgs);
                 Collections.sort(tab);
-                return tab;
+                if (!tab.isEmpty()) {
+                    final String currArg = subArgs[subArgs.length - 1];
+                    for (String s : tab) {
+                        if (s.toLowerCase(Locale.ROOT).startsWith(currArg.toLowerCase(Locale.ROOT))) {
+                            output.add(s);
+                        }
+                    }
+                }
+                return output;
             }
         }
         return output;
diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DebugSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DebugSubCmd.java
index 74e5b2998..95c20c9ff 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DebugSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DebugSubCmd.java
@@ -71,7 +71,6 @@ public class DebugSubCmd extends ViaSubCommand {
     @Override
     public List<String> onTabComplete(final ViaCommandSender sender, final String[] args) {
         if (args.length == 1) {
-            //TODO match current input
             return Arrays.asList("clear", "logposttransform", "add", "remove");
         }
         return Collections.emptyList();