diff --git a/src/app/leaderboard/hooks/useLeaderboard.ts b/src/app/leaderboard/hooks/useLeaderboard.ts
index bc2fc60e..09d275f8 100644
--- a/src/app/leaderboard/hooks/useLeaderboard.ts
+++ b/src/app/leaderboard/hooks/useLeaderboard.ts
@@ -163,7 +163,7 @@ const useLeaderboard = () => {
           state: followState,
           isLoading: followState
             ? isRefetchingFollowStates
-            : isFollowStatesLoading || isFetchingNextFollowStatesPage || isRefetchingFollowStates,
+            : isFollowStatesLoading || isFetchingNextFollowStatesPage,
         },
       }
     })
diff --git a/src/hooks/use-button-state-batch-query.ts b/src/hooks/use-button-state-batch-query.ts
index a9aa8295..f5e16d67 100644
--- a/src/hooks/use-button-state-batch-query.ts
+++ b/src/hooks/use-button-state-batch-query.ts
@@ -110,7 +110,7 @@ export const useBatchButtonStateQuery = <T extends { address: string }>({
   const profilesWithFollowStates = useMemo(() => {
     return profiles.map((profile, index) => {
       const followState = followStatesMap.get(profile.address.toLowerCase()) as FollowStateResponse
-      const isLoading = followState ? isRefetchingFollowStates : true
+      const isLoading = followState ? isRefetchingFollowStates : (isFollowStatesLoading || isFetchingNextFollowStatesPage)
 
       return {
         ...profile,