diff --git a/app/components/message_attachments/attachment_fields.js b/app/components/message_attachments/attachment_fields.js
index cb96cff17..dd42f57f0 100644
--- a/app/components/message_attachments/attachment_fields.js
+++ b/app/components/message_attachments/attachment_fields.js
@@ -66,16 +66,18 @@ export default class AttachmentFields extends PureComponent {
                     style={style.flex}
                     key={`attachment__field-${i}__${nrTables}`}
                 >
-                    <View
-                        style={style.headingContainer}
-                        key={`attachment__field-caption-${i}__${nrTables}`}
-                    >
-                        <View>
-                            <Text style={style.heading}>
-                                {field.title}
-                            </Text>
+                    {Boolean(field.title) && (
+                        <View
+                            style={style.headingContainer}
+                            key={`attachment__field-caption-${i}__${nrTables}`}
+                        >
+                            <View>
+                                <Text style={style.heading}>
+                                    {field.title}
+                                </Text>
+                            </View>
                         </View>
-                    </View>
+                    )}
                     <View
                         style={style.flex}
                         key={`attachment__field-${i}__${nrTables}`}
diff --git a/app/components/message_attachments/message_attachment.js b/app/components/message_attachments/message_attachment.js
index 19fd18e25..9ff263e2c 100644
--- a/app/components/message_attachments/message_attachment.js
+++ b/app/components/message_attachments/message_attachment.js
@@ -97,7 +97,7 @@ export default class MessageAttachment extends PureComponent {
                         navigator={navigator}
                         onPermalinkPress={onPermalinkPress}
                         textStyles={textStyles}
-                        value={attachment.text || attachment.fallback}
+                        value={attachment.text}
                     />
                     <AttachmentFields
                         baseTextStyle={baseTextStyle}