diff --git a/src/routes/economic-calendar/+page.svelte b/src/routes/economic-calendar/+page.svelte
index 0a5ea849..7ab42d82 100644
--- a/src/routes/economic-calendar/+page.svelte
+++ b/src/routes/economic-calendar/+page.svelte
@@ -47,7 +47,12 @@
   }
 
   // Whenever filters are applied and the worker exists, trigger filtering
-  $: if (filterList.length > 0 && syncWorker) {
+  $: if (
+    filterList.length > 0 &&
+    syncWorker &&
+    selectedWeekday &&
+    currentWeek
+  ) {
     loadWorker();
   }