Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream

app/javascript/mastodon/features/account_featured/index.tsx

@@ -88,7 +88,8 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
 
   const hasFeaturedAccounts = !featuredAccountIds.isEmpty();
 
-  const isLoading = !accountId || collectionsLoadStatus !== 'idle';
+  const isLoading =
+    !accountId || (collectionsEnabled && collectionsLoadStatus !== 'idle');
 
   if (accountId === null) {
     return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;