diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt
index 436de4d28..2e204658b 100644
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MQTTConfigItemList.kt
@@ -72,7 +72,7 @@ fun MQTTConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack:
     val consentValid =
         if (formState.value.mapReportingEnabled) {
             formState.value.mapReportSettings.shouldReportLocation &&
-                mqttConfig.mapReportSettings.publishIntervalSecs >= MIN_INTERVAL_SECS
+                formState.value.mapReportSettings.publishIntervalSecs >= MIN_INTERVAL_SECS
         } else {
             true
         }
diff --git a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MapReportingPreference.kt b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MapReportingPreference.kt
index 30c835860..ac1e3a984 100644
--- a/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MapReportingPreference.kt
+++ b/feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/component/MapReportingPreference.kt
@@ -51,6 +51,7 @@ import org.meshtastic.core.strings.map_reporting_summary
 import org.meshtastic.core.ui.component.DropDownPreference
 import org.meshtastic.core.ui.component.SwitchPreference
 import org.meshtastic.core.ui.component.precisionBitsToMeters
+import org.meshtastic.feature.settings.util.FixedUpdateIntervals
 import org.meshtastic.feature.settings.util.IntervalConfiguration
 import org.meshtastic.feature.settings.util.toDisplayString
 import kotlin.math.roundToInt
@@ -131,10 +132,11 @@ fun MapReportingPreference(
                     DropDownPreference(
                         modifier = Modifier.padding(bottom = 16.dp),
                         title = stringResource(Res.string.map_reporting_interval_seconds),
-                        items = publishItems.map { it.value to it.toDisplayString() },
-                        selectedItem = publishIntervalSecs,
+                        items = publishItems.map { it to it.toDisplayString() },
+                        selectedItem =
+                        FixedUpdateIntervals.fromValue(publishIntervalSecs.toLong()) ?: publishItems.first(),
                         enabled = enabled,
-                        onItemSelected = { onPublishIntervalSecsChanged(it.toInt()) },
+                        onItemSelected = { onPublishIntervalSecsChanged(it.value.toInt()) },
                     )
                 }
             }