diff --git a/core/src/main/java/co/aikar/commands/CommandCompletions.java b/core/src/main/java/co/aikar/commands/CommandCompletions.java
index ebf5fe0b..6d248255 100644
--- a/core/src/main/java/co/aikar/commands/CommandCompletions.java
+++ b/core/src/main/java/co/aikar/commands/CommandCompletions.java
@@ -263,12 +263,13 @@ public class CommandCompletions<C extends CommandCompletionContext> {
                             && args.length > ACFPatterns.SPACE.split(command.complete).length) {
                         String start = String.join(" ", args);
                         completions = completions.stream()
-                                .filter(s -> s != null && s.split(" ").length >= args.length)
-                                .filter(s -> ApacheCommonsLangUtil.startsWithIgnoreCase(s, start))
                                 .map(s -> {
-                                    String[] completionArgs = s.split(" ");
-                                    return String.join(" ",
-                                            Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
+                                    if (s != null && s.split(" ").length >= args.length && ApacheCommonsLangUtil.startsWithIgnoreCase(s, start)) {
+                                        String[] completionArgs = s.split(" ");
+                                        return String.join(" ", Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
+                                    } else {
+                                        return s;
+                                    }
                                 }).collect(Collectors.toList());
                     }