diff --git a/src/lib/components/admin/Evaluations/Feedbacks.svelte b/src/lib/components/admin/Evaluations/Feedbacks.svelte
index 54a17682a6..0ec5678f0e 100644
--- a/src/lib/components/admin/Evaluations/Feedbacks.svelte
+++ b/src/lib/components/admin/Evaluations/Feedbacks.svelte
@@ -80,11 +80,7 @@
 		}
 	};
 
-	$: if (page) {
-		getFeedbacks();
-	}
-
-	$: if (orderBy && direction) {
+	$: if (orderBy && direction && page) {
 		getFeedbacks();
 	}
 
diff --git a/src/lib/components/admin/Evaluations/Leaderboard.svelte b/src/lib/components/admin/Evaluations/Leaderboard.svelte
index 837400e007..e16e62c98c 100644
--- a/src/lib/components/admin/Evaluations/Leaderboard.svelte
+++ b/src/lib/components/admin/Evaluations/Leaderboard.svelte
@@ -79,9 +79,9 @@
 		debounceTimer = setTimeout(() => loadLeaderboard(query), 500);
 	};
 
-	$: query, debouncedLoad();
-
-	onMount(() => loadLeaderboard());
+	$: if (query !== null) {
+		debouncedLoad();
+	}
 
 	$: sortedModels = [...rankedModels].sort((a, b) => {
 		const getValue = (m, key) => {