diff --git a/packages/pl-fe/src/components/status-content.tsx b/packages/pl-fe/src/components/status-content.tsx
index 3241ff01d..033385ad0 100644
--- a/packages/pl-fe/src/components/status-content.tsx
+++ b/packages/pl-fe/src/components/status-content.tsx
@@ -287,6 +287,14 @@ const StatusContent: React.FC<IStatusContent> = React.memo(({
       output.push(<TranslateButton status={status} />);
     }
 
+    if (media) {
+      output.push(media);
+    }
+
+    if (hashtags.length) {
+      output.push(<HashtagsBar key='hashtags' hashtags={hashtags} />);
+    }
+
     return <>{output}</>;
   }
 });
diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx
index f5e819594..d5fccae75 100644
--- a/packages/pl-fe/src/components/status.tsx
+++ b/packages/pl-fe/src/components/status.tsx
@@ -399,15 +399,13 @@ const Status: React.FC<IStatus> = (props) => {
 
             <Stack className='relative z-0'>
               {actualStatus.event ? <EventPreview className='shadow-xl' status={actualStatus} /> : (
-                <Stack space={4}>
-                  <StatusContent
-                    status={actualStatus}
-                    onClick={handleClick}
-                    collapsable
-                    translatable
-                    withMedia
-                  />
-                </Stack>
+                <StatusContent
+                  status={actualStatus}
+                  onClick={handleClick}
+                  collapsable
+                  translatable
+                  withMedia
+                />
               )}
             </Stack>