diff --git a/core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigHandlerImpl.kt b/core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigHandlerImpl.kt
index 4917bacfa..10adce57a 100644
--- a/core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigHandlerImpl.kt
+++ b/core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigHandlerImpl.kt
@@ -130,5 +130,6 @@ private fun ModuleConfig.summarize(): String = when {
     detection_sensor != null -> "detection_sensor"
     paxcounter != null -> "paxcounter"
     statusmessage != null -> "statusmessage"
+    tak != null -> "tak"
     else -> "unknown"
 }
diff --git a/core/datastore/src/commonMain/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt b/core/datastore/src/commonMain/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt
index b0e86bbf8..09b18f2a4 100644
--- a/core/datastore/src/commonMain/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt
+++ b/core/datastore/src/commonMain/kotlin/org/meshtastic/core/datastore/ModuleConfigDataSource.kt
@@ -47,6 +47,7 @@ class ModuleConfigDataSource(
     }
 
     /** Updates [LocalModuleConfig] from each [ModuleConfig] oneOf. */
+    @Suppress("CyclomaticComplexMethod")
     suspend fun setLocalModuleConfig(config: ModuleConfig) = moduleConfigStore.updateData { current ->
         when {
             config.mqtt != null -> current.copy(mqtt = config.mqtt)
@@ -78,6 +79,8 @@ class ModuleConfigDataSource(
 
             config.statusmessage != null -> current.copy(statusmessage = config.statusmessage)
 
+            config.tak != null -> current.copy(tak = config.tak)
+
             else -> current
         }
     }