diff --git a/src/components/quoted-status.tsx b/src/components/quoted-status.tsx
index 657240f3b..dcbeede1d 100644
--- a/src/components/quoted-status.tsx
+++ b/src/components/quoted-status.tsx
@@ -136,7 +136,7 @@ const QuotedStatus: React.FC<IQuotedStatus> = ({ status, onCancel, compose }) =>
 
               {status.quote && <QuotedStatusIndicator statusId={status.quote as string} />}
 
-              {status.media_attachments.size > 0 && (
+              {status.media_attachments.length > 0 && (
                 <StatusMedia
                   status={status}
                   muted={compose}
diff --git a/src/features/compose/containers/quoted-status-container.tsx b/src/features/compose/containers/quoted-status-container.tsx
index 3fdd0f66a..bb8fd3d36 100644
--- a/src/features/compose/containers/quoted-status-container.tsx
+++ b/src/features/compose/containers/quoted-status-container.tsx
@@ -15,7 +15,7 @@ const QuotedStatusContainer: React.FC<IQuotedStatusContainer> = ({ composeId })
   const dispatch = useAppDispatch();
   const getStatus = useCallback(makeGetStatus(), []);
 
-  const status = useAppSelector(state => getStatus(state, { id: state.compose.get(composeId)?.quote! }));
+  const status = useAppSelector(state => getStatus(state, { id: state.compose.composeId.quote! }));
 
   const onCancel = () => {
     dispatch(cancelQuoteCompose());
diff --git a/src/features/status/components/detailed-status.tsx b/src/features/status/components/detailed-status.tsx
index 39bf23c7f..c5a2602f0 100644
--- a/src/features/status/components/detailed-status.tsx
+++ b/src/features/status/components/detailed-status.tsx
@@ -159,7 +159,7 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
 
             <TranslateButton status={actualStatus} />
 
-            {(withMedia && (quote || actualStatus.card || actualStatus.media_attachments.size > 0)) && (
+            {(withMedia && (quote || actualStatus.card || actualStatus.media_attachments.length > 0)) && (
               <Stack space={4}>
                 <StatusMedia
                   status={actualStatus}