diff --git a/apps/quick-learn-backend/src/routes/cronjob/leaderboard-cron.service.ts b/apps/quick-learn-backend/src/routes/cronjob/leaderboard-cron.service.ts
index 3cb09eed..114ea10f 100644
--- a/apps/quick-learn-backend/src/routes/cronjob/leaderboard-cron.service.ts
+++ b/apps/quick-learn-backend/src/routes/cronjob/leaderboard-cron.service.ts
@@ -111,7 +111,7 @@ export class LeaderboardCronService {
           fullName: user.display_name,
           rank: userLeaderboardData.rank,
           totalMembers: totalMembers,
-          leaderboardLink: `${this.frontendURL}/dashboard/leaderboard`,
+          leaderboardLink: `${this.frontendURL}/dashboard/leaderboard?type=${type}`,
         };
         await this.emailService.leaderboardEmail(leaderboardData, user.email);
       }
diff --git a/apps/quick-learn-frontend/src/app/(Dashboard)/dashboard/leaderboard/LeaderboardTable.tsx b/apps/quick-learn-frontend/src/app/(Dashboard)/dashboard/leaderboard/LeaderboardTable.tsx
index 83035ddb..5d55da01 100644
--- a/apps/quick-learn-frontend/src/app/(Dashboard)/dashboard/leaderboard/LeaderboardTable.tsx
+++ b/apps/quick-learn-frontend/src/app/(Dashboard)/dashboard/leaderboard/LeaderboardTable.tsx
@@ -12,11 +12,15 @@ import { useAppSelector } from '@src/store/hooks';
 import { selectUser } from '@src/store/features/userSlice';
 import { getRecords } from '@src/utils/helpers';
 import { LeaderboardData } from '@src/shared/types/LessonProgressTypes';
+import { useSearchParams } from 'next/navigation';
 
 const getMedalEmoji = (rank: number, lessonsCount: number) => {
-  if (rank === 1) return <span className="text-yellow-500">🥇</span>;
-  if (rank === 2) return <span className="text-gray-500">🥈</span>;
-  if (rank === 3) return <span className="text-red-500">🥉</span>;
+  if (rank === 1 && lessonsCount > 0)
+    return <span className="text-yellow-500">🥇</span>;
+  if (rank === 2 && lessonsCount > 0)
+    return <span className="text-gray-500">🥈</span>;
+  if (rank === 3 && lessonsCount > 0)
+    return <span className="text-red-500">🥉</span>;
   if (lessonsCount <= 3) {
     return (
       <span
@@ -60,7 +64,8 @@ const LeaderboardTable = () => {
   const [monthlyLeaderboard, setMonthlyLeaderboard] = useState<
     LeaderboardData[]
   >([]);
-  const [type, setType] = useState('weekly');
+  const params = useSearchParams();
+  const [type, setType] = useState(params.get('type') ?? 'weekly');
   const [page, setPage] = useState(1);
   const [hasMore, setHasMore] = useState(true);
   const [isLoading, setIsLoading] = useState(true);
diff --git a/apps/quick-learn-frontend/src/constants/lang/en.ts b/apps/quick-learn-frontend/src/constants/lang/en.ts
index 7ddacfe0..69976524 100644
--- a/apps/quick-learn-frontend/src/constants/lang/en.ts
+++ b/apps/quick-learn-frontend/src/constants/lang/en.ts
@@ -203,7 +203,7 @@ export const en = {
    * Approvals section
    */
   approvals: {
-    lessonsApprovals: 'Lessons Approvals',
+    lessonsApprovals: 'Lesson Approvals',
     subHeading:
       'Following lessons are waiting for approval after being created or updated by the team.',
     approveThisLesson: 'Approve this lesson',