diff --git a/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java b/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java
index 95af6d2a1..c3aff7c58 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java
@@ -52,10 +52,15 @@ public final class VelocityConsole extends SimpleTerminalConsole implements Comm
                 .appName("Velocity")
                 .completer((reader, parsedLine, list) -> {
                     try {
+                        boolean isCommand = parsedLine.line().indexOf(' ') == -1;
                         Optional<List<String>> o = this.server.getCommandManager().offerSuggestions(this, parsedLine.line());
                         o.ifPresent(offers -> {
                             for (String offer : offers) {
-                                list.add(new Candidate(offer.substring(1)));
+                                if (isCommand) {
+                                    list.add(new Candidate(offer.substring(1)));
+                                } else {
+                                    list.add(new Candidate(offer));
+                                }
                             }
                         });
                     } catch (Exception e) {