diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index db43df85..91db3717 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -26,7 +26,7 @@ export function useWebsitePageviews(websiteId: string, options?: { [key: string]
   };
 
   return useQuery({
-    queryKey: ['websites:pageviews', params],
+    queryKey: ['websites:pageviews', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/pageviews`, params),
     ...options,
   });
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index 36215457..2ada662f 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -23,7 +23,7 @@ export function useWebsiteStats(websiteId: string, options?: { [key: string]: st
   };
 
   return useQuery({
-    queryKey: ['websites:stats', params],
+    queryKey: ['websites:stats', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/stats`, params),
     ...options,
   });
diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx
index 0c29afa6..afe44e6f 100644
--- a/src/components/input/DateFilter.tsx
+++ b/src/components/input/DateFilter.tsx
@@ -92,7 +92,7 @@ export function DateFilter({
   const handleClose = () => setShowPicker(false);
 
   const renderValue = (value: string) => {
-    const { unit } = parseDateValue(value);
+    const { unit } = parseDateValue(value) || {};
 
     if (offset && unit === 'year') {
       return formatDate(startDate, 'yyyy', locale);
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 01cc1931..cf2f09df 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -260,7 +260,7 @@ export function getOffsetDateRange(dateRange: DateRange, increment: number) {
 
   const change = num * increment;
   const { add } = DATE_FUNCTIONS[unit];
-  const { unit: originalUnit } = parseDateValue(value);
+  const { unit: originalUnit } = parseDateValue(value) || {};
 
   switch (originalUnit) {
     case 'week':