diff --git a/ElementX/Sources/Screens/ComposerToolbar/CompletionSuggestionService.swift b/ElementX/Sources/Screens/ComposerToolbar/CompletionSuggestionService.swift
index 84643d42b0..a801d4fba3 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/CompletionSuggestionService.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/CompletionSuggestionService.swift
@@ -55,6 +55,7 @@ final class CompletionSuggestionService: CompletionSuggestionServiceProtocol {
                     return membersSuggestion
                 }
             }
+            // We only debounce if the suggestion is nil
             .map { [weak self] value in
                 let delay = self?.suggestionTriggerSubject.value == nil ? 0.0 : 0.5
                 return Just(value).delay(for: .seconds(delay), scheduler: DispatchQueue.main)