diff --git a/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx b/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx
index e2b3ec7292..3d00c04cbe 100644
--- a/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx
+++ b/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx
@@ -79,7 +79,6 @@ export const MentionsListDropdown = forwardRef(function MentionsListDropdown(pro
   // debounced search callback
   const debouncedSearchCallback = useCallback(
     debounce(async (searchQuery: string) => {
-      setIsLoading(true);
       try {
         const sectionsResponse = await searchCallback?.(searchQuery);
         if (sectionsResponse) {
@@ -96,7 +95,8 @@ export const MentionsListDropdown = forwardRef(function MentionsListDropdown(pro
 
   // trigger debounced search when query changes
   useEffect(() => {
-    if (query) {
+    if (query !== undefined && query !== null) {
+      setIsLoading(true);
       void debouncedSearchCallback(query);
     }
   }, [query, debouncedSearchCallback]);