diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java
index b5114b9b4..bdb4cbd51 100644
--- a/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java
+++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java
@@ -2,8 +2,9 @@ package us.myles.ViaVersion.bungee.commands;
 
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.TabExecutor;
 
-public class BungeeCommand extends Command {
+public class BungeeCommand extends Command implements TabExecutor{
     private final BungeeCommandHandler handler;
 
     public BungeeCommand(BungeeCommandHandler handler) {
@@ -16,4 +17,8 @@ public class BungeeCommand extends Command {
         handler.onCommand(new BungeeCommandSender(commandSender), strings);
     }
 
+    @Override
+    public Iterable<String> onTabComplete(CommandSender commandSender, String[] strings) {
+        return handler.onTabComplete(new BungeeCommandSender(commandSender), strings);
+    }
 }