diff --git a/lib/features/composer/presentation/widgets/email_address_input_builder.dart b/lib/features/composer/presentation/widgets/email_address_input_builder.dart
index e51c81f40..5a9a22353 100644
--- a/lib/features/composer/presentation/widgets/email_address_input_builder.dart
+++ b/lib/features/composer/presentation/widgets/email_address_input_builder.dart
@@ -318,14 +318,17 @@ class EmailAddressInputBuilder {
   }
 
   FutureOr<List<SuggestionEmailAddress>> _findSuggestions(String query) async {
+    log('EmailAddressInputBuilder::_findSuggestions():query: $query');
     if (_gapBetweenTagChangedAndFindSuggestion?.isActive ?? false) {
       log('EmailAddressInputBuilder::_findSuggestions(): return empty');
       return [];
     }
 
+    final currentTextOnTextField = controller?.text ?? '';
+    log('EmailAddressInputBuilder::_findSuggestions():currentTextOnTextField: $currentTextOnTextField');
     final processedQuery = query.trim();
 
-    if (processedQuery.isEmpty) {
+    if (processedQuery.isEmpty || currentTextOnTextField.isEmpty) {
       return [];
     }