diff --git a/App/frontend-app/src/components/chat/chatRoom.tsx b/App/frontend-app/src/components/chat/chatRoom.tsx
index 737229c2..da1ee7a7 100644
--- a/App/frontend-app/src/components/chat/chatRoom.tsx
+++ b/App/frontend-app/src/components/chat/chatRoom.tsx
@@ -583,6 +583,7 @@ export function ChatRoom({ searchResultDocuments, selectedDocuments, chatWithDoc
                     placeholder={t('components.chat.input-placeholder')}
                     disabled={isLoading}
                     onSubmit={handleSend}
+                    disableSend = {textAreaValue.trim().length === 0 || isLoading}
                     contentAfter={undefined}
                 />
             </div>