diff --git a/src/components/Chat/ChatMessage.tsx b/src/components/Chat/ChatMessage.tsx
index 1e277ab193..8075ca9c78 100644
--- a/src/components/Chat/ChatMessage.tsx
+++ b/src/components/Chat/ChatMessage.tsx
@@ -372,7 +372,10 @@ export const ChatMessage: FC<Props> = memo(
                         <button
                           className="button button-primary"
                           onClick={handleEditMessage}
-                          disabled={messageContent.trim().length <= 0}
+                          disabled={
+                            messageContent.trim().length <= 0 &&
+                            newEditableAttachments.length <= 0
+                          }
                           data-qa="save-and-submit"
                         >
                           {t('Save & Submit')}