diff --git a/cli/cmd/prompt.go b/cli/cmd/prompt.go
index 54d2ec6b32d1191d84824db35f06ed7866310e85..ce362b8f842aa6540dbeb493425f4042333ae2ad 100644
--- a/cli/cmd/prompt.go
+++ b/cli/cmd/prompt.go
@@ -229,13 +229,13 @@ func (pc *PromptCompleter) updateSuggestionsThroughFunc(d prompt.Document, c *co
 	if pc.lastSuggestions == nil {
 		var err error
 		newSuggestions, err := fn()
+		if err != nil {
+			return prompt.FilterHasPrefix([]prompt.Suggest{}, d.GetWordBeforeCursor(), true)
+		}
 		pc.lastSuggestions = &suggestionTracker{
 			lastCommand:    c,
 			lastSuggestion: newSuggestions,
 		}
-		if err != nil {
-			return prompt.FilterHasPrefix(pc.lastSuggestions.lastSuggestion, d.GetWordBeforeCursor(), true)
-		}
 	}
 	return prompt.FilterHasPrefix(pc.lastSuggestions.lastSuggestion, d.GetWordBeforeCursor(), true)
 }