diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx index 371326cc55..abf6bda83b 100644 --- a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx +++ b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx @@ -184,7 +184,7 @@ export default function Bucket({ {placeholders} { // (expandable || loadMore) && (expandable || !keepPlaceholders) && !loading && !expanded ? ( - (expanding || expandable || loadMore) && !loading && !expanded ? ( + (expanding || expandable || loadMore) && !loading && (expandable ? expanded : !expanded) ? ( {getBucket(activeBucket, true)} @@ -207,7 +206,8 @@ function Listing({ // } const loading = loadingMyChallenges || loadingOpenForRegistrationChallenges - || loadingOnGoingChallenges; + || loadingOnGoingChallenges + || loadingAllChallenges; const placeholders = []; if (challenges.length > 0 || (activeBucket === BUCKETS.ALL && allChallenges.length > 0)) { return (