diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 221a0e7b7..96a633d2c 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -600,6 +600,7 @@ class MessageInner extends React.PureComponent<Props, State> {
       selectedMessages,
       receivedAt,
       isUnread,
+      text,
     } = this.props;
     const { expired, expiring } = this.state;
 
@@ -628,6 +629,10 @@ class MessageInner extends React.PureComponent<Props, State> {
 
     const isIncoming = direction === 'incoming';
 
+    const hasText = Boolean(text);
+
+    const bgShouldBeTransparent = isShowingImage && !hasText;
+
     return (
       <ReadableMessage
         messageId={messageId}
@@ -653,7 +658,7 @@ class MessageInner extends React.PureComponent<Props, State> {
             className={classNames(
               'module-message__container',
               `module-message__container--${direction}`,
-              isShowingImage
+              bgShouldBeTransparent
                 ? `module-message__container--${direction}--transparent`
                 : `module-message__container--${direction}--opaque`
             )}