diff --git a/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt b/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt
index ff57913159..e0228f957c 100644
--- a/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt
+++ b/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt
@@ -63,6 +63,7 @@ class KaliumConfigsModule {
             limitTeamMembersFetchDuringSlowSync = BuildConfig.LIMIT_TEAM_MEMBERS_FETCH_DURING_SLOW_SYNC,
             isMlsResetEnabled = BuildConfig.IS_MLS_RESET_ENABLED,
             collaboraIntegration = BuildConfig.COLLABORA_INTEGRATION_ENABLED,
+            dbInvalidationControlEnabled = BuildConfig.DB_INVALIDATION_CONTROL_ENABLED
         )
     }
 }
diff --git a/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt b/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt
index c73546ea41..6d8b807d4e 100644
--- a/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt
+++ b/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt
@@ -142,4 +142,6 @@ enum class FeatureConfigs(val value: String, val configType: ConfigType) {
     IS_BUBBLE_UI_ENABLED("is_bubble_ui_enabled", ConfigType.BOOLEAN),
 
     COLLABORA_INTEGRATION_ENABLED("collabora_integration", ConfigType.BOOLEAN),
+
+    DB_INVALIDATION_CONTROL_ENABLED("db_invalidation_control_enabled", ConfigType.BOOLEAN)
 }
diff --git a/default.json b/default.json
index 20aaa700b5..500d8d831c 100644
--- a/default.json
+++ b/default.json
@@ -37,7 +37,8 @@
             "meetings_enabled": true,
             "use_async_flush_logging": true,
             "conversation_feeder_enabled": true,
-            "collabora_integration": true
+            "collabora_integration": true,
+            "db_invalidation_control_enabled": true
         },
         "staging": {
             "application_id": "com.waz.zclient.dev",
@@ -87,7 +88,8 @@
             "use_async_flush_logging": true,
             "conversation_feeder_enabled": true,
             "background_notification_retry_enabled": true,
-            "background_notification_stay_alive_seconds": 5
+            "background_notification_stay_alive_seconds": 5,
+            "db_invalidation_control_enabled": true
         },
         "fdroid": {
             "application_id": "com.wire",
@@ -163,5 +165,6 @@
     "background_notification_retry_enabled": false,
     "background_notification_stay_alive_seconds": 1,
     "is_bubble_ui_enabled": true,
-    "collabora_integration": false
+    "collabora_integration": false,
+    "db_invalidation_control_enabled": false
 }
diff --git a/kalium b/kalium
index 479d039ef9..35685adde4 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 479d039ef9211548cdd4076f7cdbd9f0248059e7
+Subproject commit 35685adde4487d788ad049ebe6fadc456e091605