diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
index b6836d84..56df0fdf 100644
--- a/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
@@ -591,11 +591,16 @@ extension StatusEditor {
     }
 
     private func resetAutoCompletion() {
-      withAnimation {
-        tagsSuggestions = []
-        mentionsSuggestions = []
-        currentSuggestionRange = nil
-        showRecentsTagsInline = false
+      if !tagsSuggestions.isEmpty ||
+          !mentionsSuggestions.isEmpty ||
+          currentSuggestionRange != nil ||
+          showRecentsTagsInline {
+        withAnimation {
+          tagsSuggestions = []
+          mentionsSuggestions = []
+          currentSuggestionRange = nil
+          showRecentsTagsInline = false
+        }
       }
     }