diff --git a/app/javascript/mastodon/components/status_quoted.tsx b/app/javascript/mastodon/components/status_quoted.tsx index d3d8b58c3..f7546d700 100644 --- a/app/javascript/mastodon/components/status_quoted.tsx +++ b/app/javascript/mastodon/components/status_quoted.tsx @@ -87,12 +87,13 @@ export const QuotedStatus: React.FC<{ const status = useAppSelector((state) => quotedStatusId ? state.statuses.get(quotedStatusId) : undefined, ); + const isQuoteLoaded = !!status && !status.get('isLoading'); useEffect(() => { - if (!status && quotedStatusId) { + if (!isQuoteLoaded && quotedStatusId) { dispatch(fetchStatus(quotedStatusId)); } - }, [status, quotedStatusId, dispatch]); + }, [isQuoteLoaded, quotedStatusId, dispatch]); // In order to find out whether the quoted post should be completely hidden // due to a matching filter, we run it through the selector used by `status_container`.