diff --git a/src/components/quoted-status.tsx b/src/components/quoted-status.tsx
index dc89a282e..7e4e297d2 100644
--- a/src/components/quoted-status.tsx
+++ b/src/components/quoted-status.tsx
@@ -104,12 +104,12 @@ const QuotedStatus: React.FC<IQuotedStatus> = ({ status, onCancel, compose }) =>
 
               {status.quote_id && <QuotedStatusIndicator statusId={status.quote_id} />}
 
-              <div className='relative'>
-                <SensitiveContentOverlay status={status} />
-                {status.media_attachments.length > 0 && (
+              {status.media_attachments.length > 0 && (
+                <div className='relative'>
+                  <SensitiveContentOverlay status={status} />
                   <StatusMedia status={status} muted={compose} />
-                )}
-              </div>
+                </div>
+              )}
             </Stack>
           </Stack>
         )}
diff --git a/src/components/status.tsx b/src/components/status.tsx
index 996cd3304..d27a45368 100644
--- a/src/components/status.tsx
+++ b/src/components/status.tsx
@@ -427,13 +427,17 @@ const Status: React.FC<IStatus> = (props) => {
                   <TranslateButton status={actualStatus} />
 
                   {(quote || actualStatus.card || actualStatus.media_attachments.length > 0) && (
-                    <Stack space={4} className='relative'>
-                      <SensitiveContentOverlay status={actualStatus} />
-                      <StatusMedia
-                        status={actualStatus}
-                        muted={muted}
-                        onClick={handleClick}
-                      />
+                    <Stack space={4}>
+                      {actualStatus.media_attachments.length > 0 && (
+                        <div className='relative'>
+                          <SensitiveContentOverlay status={actualStatus} />
+                          <StatusMedia
+                            status={actualStatus}
+                            muted={muted}
+                            onClick={handleClick}
+                          />
+                        </div>
+                      )}
 
                       {quote}
                     </Stack>
diff --git a/src/features/status/components/detailed-status.tsx b/src/features/status/components/detailed-status.tsx
index be5a56c36..d90b74e5f 100644
--- a/src/features/status/components/detailed-status.tsx
+++ b/src/features/status/components/detailed-status.tsx
@@ -126,10 +126,13 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
             <TranslateButton status={actualStatus} />
 
             {(withMedia && (quote || actualStatus.card || actualStatus.media_attachments.length > 0)) && (
-              <Stack space={4} className='relative'>
-                <SensitiveContentOverlay status={status} />
-
-                <StatusMedia status={actualStatus} />
+              <Stack space={4}>
+                {actualStatus.media_attachments.length > 0 && (
+                  <div className='relative'>
+                    <SensitiveContentOverlay status={status} />
+                    <StatusMedia status={actualStatus} />
+                  </div>
+                )}
 
                 {quote}
               </Stack>