diff --git a/mobile/lib/providers/map/map_marker.provider.dart b/mobile/lib/providers/map/map_marker.provider.dart
index 23342b77b..a0a11a063 100644
--- a/mobile/lib/providers/map/map_marker.provider.dart
+++ b/mobile/lib/providers/map/map_marker.provider.dart
@@ -12,8 +12,8 @@ Future<List<MapMarker>> mapMarkers(Ref ref) async {
   final mapState = ref.read(mapStateNotifierProvider);
   DateTime? fileCreatedAfter;
   bool? isFavorite;
-  bool? isIncludeArchived;
-  bool? isWithPartners;
+  bool isIncludeArchived = mapState.includeArchived;
+  bool isWithPartners = mapState.withPartners;
 
   if (mapState.relativeTime != 0) {
     fileCreatedAfter =
@@ -24,14 +24,6 @@ Future<List<MapMarker>> mapMarkers(Ref ref) async {
     isFavorite = true;
   }
 
-  if (!mapState.includeArchived) {
-    isIncludeArchived = false;
-  }
-
-  if (mapState.withPartners) {
-    isWithPartners = true;
-  }
-
   final markers = await service.getMapMarkers(
     isFavorite: isFavorite,
     withArchived: isIncludeArchived,
diff --git a/mobile/lib/providers/map/map_marker.provider.g.dart b/mobile/lib/providers/map/map_marker.provider.g.dart
index 76cc44a10..a4c1db7dc 100644
Binary files a/mobile/lib/providers/map/map_marker.provider.g.dart and b/mobile/lib/providers/map/map_marker.provider.g.dart differ
diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index 8e3a37cbf..8d508552b 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -189,7 +189,7 @@
 
     return await getMapMarkers(
       {
-        isArchived: includeArchived && undefined,
+        isArchived: includeArchived || undefined,
         isFavorite: onlyFavorites || undefined,
         fileCreatedAfter: fileCreatedAfter || undefined,
         fileCreatedBefore,