diff --git a/web/src/lib/components/shared-components/map/Map.svelte b/web/src/lib/components/shared-components/map/Map.svelte
index 21fc991116..a7e3420c7d 100644
--- a/web/src/lib/components/shared-components/map/Map.svelte
+++ b/web/src/lib/components/shared-components/map/Map.svelte
@@ -216,8 +216,9 @@
     }
 
     return {
-      fileCreatedAfter: dateAfter,
-      fileCreatedBefore: dateBefore,
+      // $mapSettings stores no value as an empty string
+      fileCreatedAfter: dateAfter || undefined,
+      fileCreatedBefore: dateBefore || undefined,
     };
   }
 
diff --git a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte
index 9bec1be1f8..95a4d0974b 100644
--- a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte
+++ b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte
@@ -82,7 +82,11 @@
 
   const timelineOptions = $derived({
     bbox: timelineBoundingBox,
-    visibility: $mapSettings.includeArchived ? undefined : AssetVisibility.Timeline,
+    visibility: $mapSettings.withPartners
+      ? AssetVisibility.Timeline
+      : $mapSettings.includeArchived
+        ? undefined
+        : AssetVisibility.Archive,
     isFavorite: $mapSettings.onlyFavorites || undefined,
     withPartners: $mapSettings.withPartners || undefined,
     assetFilter: selectedClusterIds,