diff --git a/app/javascript/mastodon/components/status_quoted.tsx b/app/javascript/mastodon/components/status_quoted.tsx index 2f1354c27a..cbb4e2f162 100644 --- a/app/javascript/mastodon/components/status_quoted.tsx +++ b/app/javascript/mastodon/components/status_quoted.tsx @@ -158,7 +158,11 @@ interface StatusQuoteManagerProps { */ export const StatusQuoteManager = (props: StatusQuoteManagerProps) => { - const status = useAppSelector((state) => state.statuses.get(props.id)); + const status = useAppSelector((state) => { + const status = state.statuses.get(props.id); + const reblogId = status?.get('reblog') as string | undefined; + return reblogId ? state.statuses.get(reblogId) : status; + }); const quote = status?.get('quote') as QuoteMap | undefined; if (quote) {