diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.html b/packages/rocketchat-message-attachments/client/messageAttachment.html
index 0cbb3d7bf2a32..4c3879a32c01e 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.html
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.html
@@ -45,22 +45,24 @@
 				</div>
 			{{/if}}
 
-			<div class="attachment-flex">
-				{{#if thumb_url}}
-					<div class="attachment-thumb">
-						<img src="{{fixCordova thumb_url}}">
-					</div>
-				{{/if}}
+			{{#unless collapsed}}
+				<div class="attachment-flex">
+					{{#if thumb_url}}
+						<div class="attachment-thumb">
+							<img src="{{fixCordova thumb_url}}">
+						</div>
+					{{/if}}
 
-				{{#if text}}
-					<div class="attachment-flex-column-grow attachment-text">
-						{{{parsedText}}}
-					</div>
-				{{/if}}
-			</div>
+					{{#if text}}
+						<div class="attachment-flex-column-grow attachment-text">
+							{{{parsedText}}}
+						</div>
+					{{/if}}
+				</div>
+			{{/unless}}
 
 			{{#if image_url}}
-				{{#unless collapsed}}
+				{{#unless mediaCollapsed}}
 					<div class="attachment-image">
 					{{#if loadImage}}
 						<figure>
@@ -89,7 +91,7 @@
 			{{/if}}
 
 			{{#if audio_url}}
-				{{#unless collapsed}}
+				{{#unless mediaCollapsed}}
 					<div class="attachment-audio">
 						<audio controls>
 							<source src="{{fixCordova audio_url}}" type="{{audio_type}}" data-description="{{description}}">
@@ -100,7 +102,7 @@
 			{{/if}}
 
 			{{#if video_url}}
-				{{#unless collapsed}}
+				{{#unless mediaCollapsed}}
 					<div class="attachment-video">
 						<video controls class="inline-video">
 							<source src="{{fixCordova video_url}}" type="{{video_type}}" data-description="{{description}}">
diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/packages/rocketchat-message-attachments/client/messageAttachment.js
index d0df4d8f3b5f2..69680886f5c5f 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.js
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.js
@@ -52,6 +52,12 @@ Template.messageAttachment.helpers({
 		return colors[this.color] || this.color;
 	},
 	collapsed() {
+		if (this.collapsed != null) {
+			return this.collapsed;
+		}
+		return false;
+	},
+	mediaCollapsed() {
 		if (this.collapsed != null) {
 			return this.collapsed;
 		} else {