diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index 696b92b..63d93a2 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -344,7 +344,7 @@
     StringList &matches
 )
 {
-    if (WantsRawCommandString())
+    if (WantsRawCommandString() && !WantsCompletion())
     {
         // FIXME: Abstract telling the completion to insert the completion character.
         matches.Clear();