diff --git a/src/pages/common/components/ChatComponent/ChatComponent.tsx b/src/pages/common/components/ChatComponent/ChatComponent.tsx
index 925bb707c..5bd1d392d 100644
--- a/src/pages/common/components/ChatComponent/ChatComponent.tsx
+++ b/src/pages/common/components/ChatComponent/ChatComponent.tsx
@@ -261,6 +261,7 @@ export default function ChatComponent({
   const [shouldReinitializeEditor, setShouldReinitializeEditor] =
     useState(false);
   const onClear = () => {
+    textInputRef?.current?.clear?.();
     setShouldReinitializeEditor(true);
     setMessage(parseStringToTextEditorValue());
   };
diff --git a/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx b/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx
index 7400b1212..526f8faa3 100644
--- a/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx
+++ b/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx
@@ -45,6 +45,8 @@ import {
   checkIsEmptyCheckboxCreationText,
 } from "./utils";
 import styles from "./BaseTextEditor.module.scss";
+import { useFeatureFlag } from "@/shared/hooks";
+import { AI_PRO_USER, AI_USER, FeatureFlags } from "@/shared/constants";
 
 export interface BaseTextEditorHandles {
   focus: () => void;
@@ -123,6 +125,13 @@ const BaseTextEditor = forwardRef<BaseTextEditorHandles, TextEditorProps>((props
       ),
     [],
   );
+  const featureFlags = useFeatureFlag();
+  const isAiBotProEnabled = featureFlags?.get(FeatureFlags.AiBotPro);
+
+  const usersWithAI = useMemo(
+    () => [isAiBotProEnabled ? AI_PRO_USER : AI_USER, ...(users ?? [])],
+    [users],
+  ); 
 
   const [target, setTarget] = useState<Range | null>();
   const [shouldFocusTarget, setShouldFocusTarget] = useState(false);
@@ -227,7 +236,7 @@ const BaseTextEditor = forwardRef<BaseTextEditorHandles, TextEditorProps>((props
     }
   };
 
-  const chars = (users ?? []).filter((user) => {
+  const chars = (usersWithAI ?? []).filter((user) => {
     return getUserName(user)
       ?.toLowerCase()
       .startsWith(search.text.substring(1).toLowerCase());
diff --git a/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.tsx b/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.tsx
index e4a2f3c24..583477cc1 100644
--- a/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.tsx
+++ b/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.tsx
@@ -1,10 +1,8 @@
 import React, { FC, useEffect, useMemo, useRef, useState } from "react";
 import { uniq } from "lodash";
 import { UserAvatar } from "@/shared/components";
-import { AI_PRO_USER, AI_USER, FeatureFlags } from "@/shared/constants";
 import { KeyboardKeys } from "@/shared/constants/keyboardKeys";
 import { useOutsideClick } from "@/shared/hooks";
-import { useFeatureFlag } from "@/shared/hooks/useFeatureFlag";
 import { User } from "@/shared/models";
 import { Loader } from "@/shared/ui-kit";
 import { getUserName } from "@/shared/utils";
@@ -22,20 +20,15 @@ export interface MentionDropdownProps {
 const MentionDropdown: FC<MentionDropdownProps> = (props) => {
   const {
     onClick,
-    users: initialUsers = [],
+    users = [],
     onClose,
     shouldFocusTarget,
   } = props;
   const mentionRef = useRef(null);
   const listRefs = useRef<HTMLLIElement[]>([]);
-  const featureFlags = useFeatureFlag();
-  const isAiBotProEnabled = featureFlags?.get(FeatureFlags.AiBotPro);
   const { isOutside, setOutsideValue } = useOutsideClick(mentionRef);
   const [index, setIndex] = useState(0);
-  const users = useMemo(
-    () => [isAiBotProEnabled ? AI_PRO_USER : AI_USER, ...initialUsers],
-    [initialUsers, isAiBotProEnabled],
-  );
+
   const userIds = useMemo(() => users.map(({ uid }) => uid), [users]);
 
   useEffect(() => {