diff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(app)/dashboard/page.tsx
index e3be321..1d05cfc 100644
--- a/src/app/(app)/dashboard/page.tsx
+++ b/src/app/(app)/dashboard/page.tsx
@@ -112,6 +112,7 @@ export default async function DashboardPage() {
     .in('source', ['review', 'help_review']);
   const mentorPoints = mentorEvents?.reduce((acc, e) => acc + (e.xp_delta || 0), 0) || 0;
 
+  // Leaderboard
   // Leaderboard
   const { data: leaders } = await service
     .from('profiles')
@@ -119,6 +120,28 @@ export default async function DashboardPage() {
     .order('xp', { ascending: false })
     .limit(4);
 
+  // Get all profiles to calculate current user's rank
+  const { data: allProfiles } = await service
+    .from('profiles')
+    .select('github_handle, xp')
+    .order('xp', { ascending: false });
+
+  const currentUserRank =
+    allProfiles?.findIndex((p: any) => p.github_handle === profile?.github_handle) ?? -1;
+
+  const myLeaderboardEntry =
+    currentUserRank >= 0
+      ? {
+          github_handle: profile?.github_handle ?? 'You',
+          xp,
+          rank: currentUserRank + 1,
+        }
+      : null;
+
+  const isUserVisible = leaders?.some(
+    (leader: any) => leader.github_handle === profile?.github_handle,
+  );
+
   // Mentees
   const { data: menteesData } = await service
     .from('help_requests')
@@ -238,23 +261,64 @@ export default async function DashboardPage() {
             <section>
               <div className="mb-6 flex items-center justify-between border-b border-[#2d333b] pb-4">
                 <h2 className="text-[11px] uppercase tracking-widest text-zinc-500">
-                  ACTIVE ISSUES
+                  LEADERBOARD SNAPSHOT
                 </h2>
-                <Link
-                  href="/issues"
-                  className="flex items-center gap-2 text-[11px] uppercase tracking-widest text-zinc-400 hover:text-white"
-                >
-                  BROWSE MORE <ArrowRight className="h-3 w-3" />
-                </Link>
+
+                <span className="text-[11px] uppercase tracking-widest text-zinc-500">GLOBAL</span>
               </div>
 
-              {recs.length > 0 ? (
-                <RecCards recs={recs} />
-              ) : (
-                <div className="py-4 text-sm text-zinc-500">
-                  No recommendations yet. Check back soon.
-                </div>
-              )}
+              <div className="text-xs uppercase tracking-widest">
+                {leaders && leaders.length > 0 ? (
+                  <>
+                    {leaders.map((leader: any, index: number) => {
+                      const isMe = leader.github_handle === profile?.github_handle;
+
+                      return (
+                        <div
+                          key={leader.github_handle}
+                          className={`flex justify-between border-b border-[#2d333b] py-3.5 ${
+                            isMe ? '-mx-3 bg-[#3b0764]/40 px-3 text-purple-300' : 'text-zinc-400'
+                          }`}
+                        >
+                          <div className="flex gap-5">
+                            <span className={`w-6 ${isMe ? 'opacity-50' : 'text-zinc-600'}`}>
+                              {(index + 1).toString().padStart(2, '0')}
+                            </span>
+                            {leader.github_handle} {isMe && '(YOU)'}
+                          </div>
+
+                          <span>{leader.xp.toLocaleString()} XP</span>
+                        </div>
+                      );
+                    })}
+
+                    {!isUserVisible && myLeaderboardEntry && (
+                      <>
+                        <div className="border-t border-[#3f3f46] pb-2 pt-5">
+                          <span className="text-[10px] tracking-[0.3em] text-zinc-500">
+                            YOUR RANK
+                          </span>
+                        </div>
+
+                        <div className="-mx-3 flex justify-between bg-[#3b0764]/30 px-3 py-3.5 text-purple-300">
+                          <div className="flex gap-5">
+                            <span className="w-6 opacity-50">
+                              {myLeaderboardEntry.rank.toString().padStart(2, '0')}
+                            </span>
+                            {myLeaderboardEntry.github_handle} (YOU)
+                          </div>
+
+                          <span>{myLeaderboardEntry.xp.toLocaleString()} XP</span>
+                        </div>
+                      </>
+                    )}
+                  </>
+                ) : (
+                  <div className="py-4 text-[11px] uppercase tracking-widest text-zinc-500">
+                    Leaderboard is empty.
+                  </div>
+                )}
+              </div>
             </section>
 
             <section>
diff --git a/src/app/(app)/leaderboard/page.tsx b/src/app/(app)/leaderboard/page.tsx
index 1ceb434..55d4315 100644
--- a/src/app/(app)/leaderboard/page.tsx
+++ b/src/app/(app)/leaderboard/page.tsx
@@ -27,33 +27,80 @@ export default async function LeaderboardPage({
         </nav>
 
         <ul className="mt-6 divide-y divide-zinc-800 rounded-2xl border border-zinc-800 bg-zinc-900">
-          {isOk(result) && result.data.length === 0 ? (
-            <li className="p-6 text-[11px] uppercase tracking-widest text-zinc-500">
-              BE THE FIRST ON THE BOARD — MERGE A PR TO EARN XP{' '}
-            </li>
+          {isOk(result) && result.data.entries.length === 0 ? (
+            <li className="p-6 text-zinc-400">No entries yet.</li>
           ) : isOk(result) ? (
-            result.data.map((entry) => (
-              <li key={entry.userId} className="flex items-center gap-4 p-4">
-                <span className="w-8 text-zinc-500">#{entry.rank}</span>
-                {entry.avatarUrl && (
-                  // eslint-disable-next-line @next/next/no-img-element
-                  <img
-                    src={entry.avatarUrl}
-                    alt=""
-                    className="h-8 w-8 rounded-full"
-                    referrerPolicy="no-referrer"
-                  />
-                )}
-                <Link href={`/@${entry.githubHandle}`} className="flex-1 hover:underline">
-                  <span className="font-medium">@{entry.githubHandle}</span>
-                  {entry.displayName && (
-                    <span className="ml-2 text-sm text-zinc-500">{entry.displayName}</span>
-                  )}
-                </Link>
-                <span className="text-sm tabular-nums">L{entry.level}</span>
-                <span className="w-20 text-right tabular-nums">{entry.xp.toLocaleString()} XP</span>
-              </li>
-            ))
+            <>
+              {(() => {
+                // Current logged-in user handle from visible list
+                const currentGithubHandle = result.data.entries.find((e: any) => e.rank)?.githubHandle;
+
+                const isUserVisible = result.data.entries.some(
+                  (entry: any) => entry.githubHandle === currentGithubHandle,
+                );
+
+                return (
+                  <>
+                    {result.data.entries.map((entry: any) => {
+                      const isMe = entry.githubHandle === currentGithubHandle;
+
+                      return (
+                        <li
+                          key={entry.userId}
+                          className={`flex items-center gap-4 p-4 ${
+                            isMe ? 'bg-purple-950/30 text-purple-300' : ''
+                          }`}
+                        >
+                          <span className="w-8 text-zinc-500">#{entry.rank}</span>
+
+                          {entry.avatarUrl && (
+                            // eslint-disable-next-line @next/next/no-img-element
+                            <img
+                              src={entry.avatarUrl}
+                              alt=""
+                              className="h-8 w-8 rounded-full"
+                              referrerPolicy="no-referrer"
+                            />
+                          )}
+
+                          <Link href={`/@${entry.githubHandle}`} className="flex-1 hover:underline">
+                            <span className="font-medium">@{entry.githubHandle}</span>
+
+                            {entry.displayName && (
+                              <span className="ml-2 text-sm text-zinc-500">
+                                {entry.displayName}
+                              </span>
+                            )}
+
+                            {isMe && <span className="ml-2 text-xs text-purple-400">(YOU)</span>}
+                          </Link>
+
+                          <span className="text-sm tabular-nums">L{entry.level}</span>
+
+                          <span className="w-20 text-right tabular-nums">
+                            {entry.xp.toLocaleString()} XP
+                          </span>
+                        </li>
+                      );
+                    })}
+
+                    {!isUserVisible && (
+                      <>
+                        <li className="border-t border-zinc-700 px-4 pb-2 pt-4">
+                          <span className="text-xs font-semibold tracking-wide text-zinc-500">
+                            YOUR RANK
+                          </span>
+                        </li>
+
+                        <li className="flex items-center gap-4 bg-purple-950/20 p-4 text-purple-300">
+                          <span className="text-sm">Your rank is outside visible leaderboard.</span>
+                        </li>
+                      </>
+                    )}
+                  </>
+                );
+              })()}
+            </>
           ) : (
             <li className="p-6 text-rose-400">Couldn&apos;t load: {result.error.message}</li>
           )}
diff --git a/src/app/actions/leaderboard.ts b/src/app/actions/leaderboard.ts
index c18f427..91a0fbf 100644
--- a/src/app/actions/leaderboard.ts
+++ b/src/app/actions/leaderboard.ts
@@ -4,6 +4,7 @@ import { sql } from 'drizzle-orm';
 import { tryGetDb } from '@/lib/db/client';
 import { cacheGet, cacheSet } from '@/lib/cache';
 import { ok, err, type Result } from '@/lib/result';
+import { getServerSupabase } from '@/lib/supabase/server';
 
 export type LeaderboardScope = 'global' | 'cohort' | 'language' | 'tag';
 
@@ -23,10 +24,15 @@ export async function getLeaderboard(
   scope: LeaderboardScope,
   scopeId: string | null,
   limit = 50,
-): Promise<Result<LeaderboardEntry[]>> {
+): Promise<
+  Result<{
+    entries: LeaderboardEntry[];
+    currentUserRank: LeaderboardEntry | null;
+  }>
+> {
   const cacheKey = `leaderboard:${scope}:${scopeId ?? 'all'}:${limit}`;
   const cached = await cacheGet<LeaderboardEntry[]>(cacheKey);
-  if (cached) return ok(cached);
+  let entries: LeaderboardEntry[] = cached ?? [];
 
   const db = tryGetDb();
   if (!db) return err('not_configured', 'database not configured');
@@ -40,15 +46,16 @@ export async function getLeaderboard(
     level: number;
   }[] = [];
 
-  if (scope === 'global') {
-    rows = (await db.execute(sql`
+  if (!cached) {
+    if (scope === 'global') {
+      rows = (await db.execute(sql`
       select id, github_handle, display_name, avatar_url, xp, level
       from profiles
       order by xp desc
       limit ${limit}
     `)) as unknown as typeof rows;
-  } else if (scope === 'cohort' && scopeId) {
-    rows = (await db.execute(sql`
+    } else if (scope === 'cohort' && scopeId) {
+      rows = (await db.execute(sql`
       select p.id, p.github_handle, p.display_name, p.avatar_url, p.xp, p.level
       from profiles p
       join cohort_members cm on cm.user_id = p.id
@@ -57,16 +64,16 @@ export async function getLeaderboard(
       order by p.xp desc
       limit ${limit}
     `)) as unknown as typeof rows;
-  } else if (scope === 'language' && scopeId) {
-    rows = (await db.execute(sql`
+    } else if (scope === 'language' && scopeId) {
+      rows = (await db.execute(sql`
       select id, github_handle, display_name, avatar_url, xp, level
       from profiles
       where primary_language = ${scopeId}
       order by xp desc
       limit ${limit}
     `)) as unknown as typeof rows;
-  } else if (scope === 'tag' && scopeId) {
-    rows = (await db.execute(sql`
+    } else if (scope === 'tag' && scopeId) {
+      rows = (await db.execute(sql`
       select p.id, p.github_handle, p.display_name, p.avatar_url, p.xp, p.level
       from profiles p
       join profile_tags pt on pt.user_id = p.id
@@ -74,25 +81,119 @@ export async function getLeaderboard(
       order by p.xp desc
       limit ${limit}
     `)) as unknown as typeof rows;
-  } else {
-    return err('invalid_scope', `scope ${scope} requires a scopeId`);
+    } else {
+      return err('invalid_scope', `scope ${scope} requires a scopeId`);
+    }
+
+    const list: typeof rows = Array.isArray(rows)
+      ? rows
+      : (rows as unknown as { rows: typeof rows }).rows;
+
+    entries = list.map((r, i) => ({
+      rank: i + 1,
+      userId: r.id,
+      githubHandle: r.github_handle,
+      displayName: r.display_name,
+      avatarUrl: r.avatar_url,
+      xp: r.xp,
+      level: r.level,
+    }));
+
+    await cacheSet(cacheKey, entries, TTL);
+  }
+
+  const sb = getServerSupabase();
+
+  let currentUserRank: LeaderboardEntry | null = null;
+
+  if (sb) {
+    const {
+      data: { user },
+    } = await sb.auth.getUser();
+
+    if (user) {
+      let rankQuery: ReturnType<typeof sql> | null;
+
+      if (scope === 'global') {
+        rankQuery = sql`
+        select count(*) + 1 as rank
+        from profiles
+        where xp > (
+          select xp from profiles where id = ${user.id}
+        )
+      `;
+      } else if (scope === 'language' && scopeId) {
+        rankQuery = sql`
+        select count(*) + 1 as rank
+        from profiles
+        where primary_language = ${scopeId}
+          and xp > (
+            select xp
+from profiles
+where id = ${user.id}
+  and primary_language = ${scopeId}
+          )
+      `;
+      } else {
+        rankQuery = null;
+      }
+
+      if (rankQuery) {
+        const rankResult = (await db.execute(rankQuery)) as unknown as {
+          rank: number;
+        }[];
+
+        let userQuery: ReturnType<typeof sql> | null;
+
+        if (scope === 'global') {
+          userQuery = sql`
+    select id, github_handle, display_name, avatar_url, xp, level
+    from profiles
+    where id = ${user.id}
+    limit 1
+  `;
+        } else if (scope === 'language' && scopeId) {
+          userQuery = sql`
+    select id, github_handle, display_name, avatar_url, xp, level
+    from profiles
+    where id = ${user.id}
+      and primary_language = ${scopeId}
+    limit 1
+  `;
+        } else {
+          userQuery = null;
+        }
+
+        if (userQuery) {
+          const userRows = (await db.execute(userQuery)) as unknown as {
+            id: string;
+            github_handle: string;
+            display_name: string | null;
+            avatar_url: string | null;
+            xp: number;
+            level: number;
+          }[];
+
+          const current = userRows[0];
+
+          if (current && rankResult[0]) {
+            currentUserRank = {
+              rank: Number(rankResult[0].rank),
+              userId: current.id,
+              githubHandle: current.github_handle,
+              displayName: current.display_name,
+              avatarUrl: current.avatar_url,
+              xp: current.xp,
+              level: current.level,
+            };
+          }
+        }
+      }
+    }
   }
 
-  // drizzle execute returns { rows: [...] } in some versions; normalize
-  const list: typeof rows = Array.isArray(rows)
-    ? rows
-    : (rows as unknown as { rows: typeof rows }).rows;
-
-  const entries: LeaderboardEntry[] = list.map((r, i) => ({
-    rank: i + 1,
-    userId: r.id,
-    githubHandle: r.github_handle,
-    displayName: r.display_name,
-    avatarUrl: r.avatar_url,
-    xp: r.xp,
-    level: r.level,
-  }));
-
-  await cacheSet(cacheKey, entries, TTL);
-  return ok(entries);
+  return ok({
+    entries,
+    currentUserRank,
+  });
 }