diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 3c728964e..9d1883f0b 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -843,7 +843,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
       // this does not call call removeAllStagedAttachmentsInConvers
       const { attachments, previews } = await this.getFiles(linkPreview);
       this.props.sendMessage({
-        body: messagePlaintext,
+        body: messagePlaintext.trim(),
         attachments: attachments || [],
         quote: extractedQuotedMessageProps,
         preview: previews,
diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx
index aee070f52..3c623ae4c 100644
--- a/ts/components/conversation/message/message-content/MessageText.tsx
+++ b/ts/components/conversation/message/message-content/MessageText.tsx
@@ -31,7 +31,7 @@ export const MessageText = (props: Props) => {
     ? window.i18n('messageDeletedPlaceholder')
     : direction === 'incoming' && status === 'error'
     ? window.i18n('incomingError')
-    : text;
+    : text?.trim();
 
   if (!contents) {
     return null;