diff --git a/src/lib/components/admin/Analytics/Dashboard.svelte b/src/lib/components/admin/Analytics/Dashboard.svelte
index dabe5928ab..11c2c0afb1 100644
--- a/src/lib/components/admin/Analytics/Dashboard.svelte
+++ b/src/lib/components/admin/Analytics/Dashboard.svelte
@@ -160,9 +160,12 @@
 		loading = false;
 	};
 
+	$: awaitingCustomRange = selectedPeriod === 'custom' && !(customStart && customEnd);
+
 	// Reload when the period, group, or custom range changes.
-	// In custom mode, wait until both dates are set to avoid a half-specified query.
-	$: if (selectedPeriod === 'custom' ? customStart && customEnd : selectedPeriod) {
+	$: if (awaitingCustomRange) {
+		loading = false;
+	} else if (selectedPeriod) {
 		// reference customStart/customEnd so this block reruns when they change
 		customStart;
 		customEnd;
@@ -281,7 +284,7 @@
 />
 
 <!-- Summary stats -->
-{#if !loading}
+{#if !loading && !awaitingCustomRange}
 	<div class="flex gap-3 text-xs text-gray-500 dark:text-gray-400 px-0.5 pb-2">
 		<span
 			><span class="font-normal text-gray-900 dark:text-gray-300"
@@ -343,6 +346,10 @@
 	<div class="my-10 flex justify-center">
 		<Spinner className="size-5" />
 	</div>
+{:else if awaitingCustomRange}
+	<div class="my-10 text-center text-xs text-gray-500 dark:text-gray-400">
+		{$i18n.t('Select a start and end date to view analytics.')}
+	</div>
 {:else}
 	<div class="grid md:grid-cols-2 gap-4">
 		<!-- Model Usage Table -->
diff --git a/src/lib/i18n/locales/en-US/translation.json b/src/lib/i18n/locales/en-US/translation.json
index da7da2fb01..e381ce61e8 100644
--- a/src/lib/i18n/locales/en-US/translation.json
+++ b/src/lib/i18n/locales/en-US/translation.json
@@ -2343,6 +2343,7 @@
 	"Select a pipeline url": "",
 	"Select a reranking model engine": "",
 	"Select a role": "",
+	"Select a start and end date to view analytics.": "",
 	"Select a theme": "",
 	"Select a tool": "",
 	"Select a voice": "",