diff --git a/app/containers/markdown/index.tsx b/app/containers/markdown/index.tsx
index 27dc0ff37..ca8ce9271 100644
--- a/app/containers/markdown/index.tsx
+++ b/app/containers/markdown/index.tsx
@@ -45,6 +45,7 @@ interface IMarkdownProps {
 	testID?: string;
 	style?: StyleProp<TextStyle>[];
 	onLinkPress?: TOnLinkPress;
+	isTranslated?: boolean;
 }
 
 type TLiteral = {
@@ -93,9 +94,7 @@ class Markdown extends PureComponent<IMarkdownProps, any> {
 
 	constructor(props: IMarkdownProps) {
 		super(props);
-		if (!this.isNewMarkdown) {
-			this.renderer = this.createRenderer();
-		}
+		this.renderer = this.createRenderer();
 	}
 
 	createRenderer = () =>
@@ -310,13 +309,24 @@ class Markdown extends PureComponent<IMarkdownProps, any> {
 	};
 
 	render() {
-		const { msg, md, mentions, channels, navToRoomInfo, useRealName, username = '', getCustomEmoji, onLinkPress } = this.props;
+		const {
+			msg,
+			md,
+			mentions,
+			channels,
+			navToRoomInfo,
+			useRealName,
+			username = '',
+			getCustomEmoji,
+			onLinkPress,
+			isTranslated
+		} = this.props;
 
 		if (!msg) {
 			return null;
 		}
 
-		if (this.isNewMarkdown) {
+		if (this.isNewMarkdown && !isTranslated) {
 			return (
 				<NewMarkdown
 					username={username}
diff --git a/app/containers/message/Content.tsx b/app/containers/message/Content.tsx
index cdfaa62c2..5e03d1eed 100644
--- a/app/containers/message/Content.tsx
+++ b/app/containers/message/Content.tsx
@@ -64,6 +64,7 @@ const Content = React.memo(
 					useRealName={props.useRealName}
 					theme={theme}
 					onLinkPress={onLinkPress}
+					isTranslated={props.isTranslated}
 				/>
 			);
 		}
diff --git a/app/containers/message/index.tsx b/app/containers/message/index.tsx
index 21d74de45..7c61c37f1 100644
--- a/app/containers/message/index.tsx
+++ b/app/containers/message/index.tsx
@@ -376,10 +376,13 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 		} = item;
 
 		let message = msg;
+		let isTranslated = false;
 		// "autoTranslateRoom" and "autoTranslateLanguage" are properties from the subscription
 		// "autoTranslateMessage" is a toggle between "View Original" and "Translate" state
 		if (autoTranslateRoom && autoTranslateMessage && autoTranslateLanguage) {
-			message = getMessageTranslation(item, autoTranslateLanguage) || message;
+			const messageTranslated = getMessageTranslation(item, autoTranslateLanguage);
+			isTranslated = !!messageTranslated;
+			message = messageTranslated || message;
 		}
 
 		return (
@@ -455,6 +458,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 					blockAction={blockAction}
 					highlighted={highlighted}
 					comment={comment}
+					isTranslated={isTranslated}
 				/>
 			</MessageContext.Provider>
 		);
diff --git a/app/containers/message/interfaces.ts b/app/containers/message/interfaces.ts
index 9d0badb75..60edfb4df 100644
--- a/app/containers/message/interfaces.ts
+++ b/app/containers/message/interfaces.ts
@@ -63,6 +63,7 @@ export interface IMessageContent {
 	comment?: string;
 	hasError: boolean;
 	isHeader: boolean;
+	isTranslated: boolean;
 }
 
 export interface IMessageEmoji {