1 files changed, 1 insertions, 3 deletions
diff --git a/cli/src/cli-rl.c b/cli/src/cli-rl.c
index dd0993b8646..7831d0bcb40 100644
--- a/cli/src/cli-rl.c
+++ b/cli/src/cli-rl.c
@@ -281,11 +281,9 @@ cli_rl_autocomplete_prepare(struct cli_state *state, const char *text)
             break;
     }
 
-    if (!word)
+    if (!word || !token)
         goto out;
 
-    if (!token)
-        return 0;
     matches = cli_rl_get_matches(state, word, token);
 
     state->matches = matches;