diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 0132d26..da590a7 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -155,6 +155,7 @@ export function Leaderboard() {
         .filter(
           (u) =>
             !hasAffiliation ||
+            u.user?.id === user?.uid ||
             !!(
               u.user.affiliation &&
               leaderboard
@@ -169,15 +170,6 @@ export function Leaderboard() {
             userStats={u}
             rank={i + 1}
             isMe={u.user?.id === user?.uid}
-            isAffiliated={
-              !hasAffiliation ||
-              !!(
-                u.user.affiliation &&
-                leaderboard
-                  .toLowerCase()
-                  .startsWith(u.user.affiliation.toLowerCase())
-              )
-            }
           />
         ))}
     </div>