diff --git a/src/components/hooks/useDateParameters.ts b/src/components/hooks/useDateParameters.ts
index d84b4236a..6600ce8bc 100644
--- a/src/components/hooks/useDateParameters.ts
+++ b/src/components/hooks/useDateParameters.ts
@@ -7,9 +7,12 @@ export function useDateParameters() {
   } = useDateRange();
   const { timezone, localToUtc, canonicalizeTimezone } = useTimezone();
 
+  const startAtValue = +localToUtc(startDate);
+  const endAtValue = +localToUtc(endDate);
+
   return {
-    startAt: +localToUtc(startDate),
-    endAt: +localToUtc(endDate),
+    startAt: Number.isFinite(startAtValue) ? startAtValue : +startDate,
+    endAt: Number.isFinite(endAtValue) ? endAtValue : +endDate,
     startDate: localToUtc(startDate).toISOString(),
     endDate: localToUtc(endDate).toISOString(),
     unit,
diff --git a/src/lib/url.ts b/src/lib/url.ts
index f6772feec..a4cc7cb30 100644
--- a/src/lib/url.ts
+++ b/src/lib/url.ts
@@ -2,7 +2,7 @@ export function getQueryString(params: object = {}): string {
   const searchParams = new URLSearchParams();
 
   Object.entries(params).forEach(([key, value]) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null && !Number.isNaN(value)) {
       searchParams.append(key, value);
     }
   });