diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 462c4f3582..e3688f71ab 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -323,6 +323,7 @@
 				"${BUILT_PRODUCTS_DIR}/motionphoto/motionphoto.framework",
 				"${BUILT_PRODUCTS_DIR}/move_to_background/move_to_background.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
+				"${BUILT_PRODUCTS_DIR}/native_video_player/native_video_player.framework",
 				"${BUILT_PRODUCTS_DIR}/open_mail_app/open_mail_app.framework",
 				"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
@@ -418,6 +419,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/motionphoto.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/move_to_background.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/native_video_player.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_mail_app.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
diff --git a/mobile/lib/services/user_remote_flag_service.dart b/mobile/lib/services/user_remote_flag_service.dart
index 6164800a0b..846f061b43 100644
--- a/mobile/lib/services/user_remote_flag_service.dart
+++ b/mobile/lib/services/user_remote_flag_service.dart
@@ -6,6 +6,7 @@ import 'package:logging/logging.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/core/network/network.dart';
 import 'package:photos/events/notification_event.dart';
+import "package:photos/service_locator.dart";
 import 'package:photos/services/user_service.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -44,7 +45,11 @@ class UserRemoteFlagService {
   }
 
   bool getCachedBoolValue(String key) {
-    return _prefs.getBool(key) ?? false;
+    bool defaultValue = false;
+    if (key == mapEnabled) {
+      defaultValue = flagService.mapEnabled;
+    }
+    return _prefs.getBool(key) ?? defaultValue;
   }
 
   Future<bool> getBoolValue(String key) async {
diff --git a/mobile/plugins/ente_feature_flag/lib/src/model.dart b/mobile/plugins/ente_feature_flag/lib/src/model.dart
index f3637728e5..fa6557f22e 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/model.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/model.dart
@@ -8,7 +8,6 @@ class RemoteFlags {
   final bool disableCFWorker;
   final bool mapEnabled;
   final bool faceSearchEnabled;
-  final bool passKeyEnabled;
   final bool recoveryKeyVerified;
   final bool internalUser;
   final bool betaUser;
@@ -19,7 +18,6 @@ class RemoteFlags {
     required this.disableCFWorker,
     required this.mapEnabled,
     required this.faceSearchEnabled,
-    required this.passKeyEnabled,
     required this.recoveryKeyVerified,
     required this.internalUser,
     required this.betaUser,
@@ -31,7 +29,6 @@ class RemoteFlags {
     disableCFWorker: false,
     mapEnabled: false,
     faceSearchEnabled: false,
-    passKeyEnabled: false,
     recoveryKeyVerified: false,
     internalUser: kDebugMode,
     betaUser: kDebugMode,
@@ -45,7 +42,6 @@ class RemoteFlags {
       'disableCFWorker': disableCFWorker,
       'mapEnabled': mapEnabled,
       'faceSearchEnabled': faceSearchEnabled,
-      'passKeyEnabled': passKeyEnabled,
       'recoveryKeyVerified': recoveryKeyVerified,
       'internalUser': internalUser,
       'betaUser': betaUser,
@@ -60,7 +56,6 @@ class RemoteFlags {
       mapEnabled: map['mapEnabled'] ?? defaultValue.mapEnabled,
       faceSearchEnabled:
           map['faceSearchEnabled'] ?? defaultValue.faceSearchEnabled,
-      passKeyEnabled: map['passKeyEnabled'] ?? defaultValue.passKeyEnabled,
       recoveryKeyVerified:
           map['recoveryKeyVerified'] ?? defaultValue.recoveryKeyVerified,
       internalUser: map['internalUser'] ?? defaultValue.internalUser,
diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index 4177b9debf..e7df0f34d1 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -69,8 +69,6 @@ class FlagService {
 
   bool get faceSearchEnabled => internalUser || flags.betaUser;
 
-  bool get passKeyEnabled => flags.passKeyEnabled || internalOrBetaUser;
-
   bool get recoveryKeyVerified => flags.recoveryKeyVerified;
 
   bool get enableMobMultiPart => flags.enableMobMultiPart || internalUser;