diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
index 14790de47492c..161ba24e812c8 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
 import { IMessage, isDiscussionMessage, isThreadMainMessage, ISubscription, isE2EEMessage } from '@rocket.chat/core-typings';
-import { MessageBody, MessageBlock } from '@rocket.chat/fuselage';
+import { MessageBlock } from '@rocket.chat/fuselage';
 import { useTranslation, useUserId, TranslationKey } from '@rocket.chat/ui-contexts';
 import React, { FC, memo } from 'react';
 
@@ -54,14 +54,13 @@ const MessageContent: FC<{
 
 	return (
 		<>
-			{!message.blocks?.length && message.md && (
-				<MessageBody data-qa-type='message-body'>
-					{!isEncryptedMessage && <MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />}
-					{isEncryptedMessage && message.e2e === 'done' && (
+			{!message.blocks?.length && !!message.md?.length && (
+				<>
+					{(!isEncryptedMessage || message.e2e === 'done') && (
 						<MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />
 					)}
 					{isEncryptedMessage && message.e2e === 'pending' && t('E2E_message_encrypted_placeholder')}
-				</MessageBody>
+				</>
 			)}
 
 			{message.blocks && (
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
index 616bfd1746a97..0999bb2d11ca1 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
@@ -1,5 +1,5 @@
 import { css } from '@rocket.chat/css-in-js';
-import { Box, MessageBody, Palette } from '@rocket.chat/fuselage';
+import { MessageBody, Box, Palette } from '@rocket.chat/fuselage';
 import { MarkupInteractionContext, Markup, UserMention, ChannelMention } from '@rocket.chat/gazzodown';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
@@ -126,7 +126,7 @@ const MessageContentBody = ({ mentions, channels, md }: MessageContentBodyProps)
 	const convertAsciiToEmoji = useUserPreference<boolean>('convertAsciiEmoji', true);
 
 	return (
-		<MessageBody>
+		<MessageBody data-qa-type='message-body'>
 			<Box className={messageBodyAdditionalStyles}>
 				<MarkupInteractionContext.Provider
 					value={{