diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
index 582458417..7e3e15772 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -386,7 +386,8 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
 
   public void handleTabCompleteResponse(TabCompleteResponse response) {
     if (outstandingTabComplete != null) {
-      if (!outstandingTabComplete.isAssumeCommand()) {
+      if (!outstandingTabComplete.isAssumeCommand()
+          && outstandingTabComplete.getCommand().startsWith("/")) {
         String command = outstandingTabComplete.getCommand().substring(1);
         try {
           response.getOffers().addAll(server.getCommandManager().offerSuggestions(player, command));