diff --git a/client/src/components/Input/index.jsx b/client/src/components/Input/index.jsx
index 8f98a4339e..a21ccc6f93 100644
--- a/client/src/components/Input/index.jsx
+++ b/client/src/components/Input/index.jsx
@@ -33,7 +33,7 @@ export default function TextChat({ isSearchView = false }) {
   // const bingStylesRef = useRef(null);
   const [showBingToneSetting, setShowBingToneSetting] = useState(false);
 
-  const isNotAppendable = latestMessage?.unfinished || latestMessage?.error;
+  const isNotAppendable = (latestMessage?.unfinished & !isSubmitting) || latestMessage?.error;
 
   // auto focus to input, when enter a conversation.
   useEffect(() => {
@@ -69,12 +69,16 @@ export default function TextChat({ isSearchView = false }) {
   };
 
   const handleKeyDown = e => {
+    if (e.key === 'Enter' && isSubmitting) {
+      return;
+    }
+
     if (e.key === 'Enter' && !e.shiftKey) {
       e.preventDefault();
     }
 
-    if (e.key === 'Enter' && !e.shiftKey) {
-      if (!isComposing?.current) submitMessage();
+    if (e.key === 'Enter' && !e.shiftKey && !isComposing?.current) {
+      submitMessage();
     }
   };