diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
index 716dd559..3dce4f41 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
@@ -133,14 +133,14 @@ fun BunkerMultiEventHomeScreen(
                 .fillMaxWidth()
                 .clickable {
                     val newValue = allCheckedState != ToggleableState.On
-                    bunkerRequests.forEach { MultiEventScreenIntents.checkedStates[it.request.id] = newValue }
+                    MultiEventScreenIntents.checkedStates.putAll(bunkerRequests.associate { it.request.id to newValue })
                 },
         ) {
             TriStateCheckbox(
                 state = allCheckedState,
                 onClick = {
                     val newValue = allCheckedState != ToggleableState.On
-                    bunkerRequests.forEach { MultiEventScreenIntents.checkedStates[it.request.id] = newValue }
+                    MultiEventScreenIntents.checkedStates.putAll(bunkerRequests.associate { it.request.id to newValue })
                 },
             )
             Text(stringResource(R.string.select_deselect_all))
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
index 1b133f7e..d3a3bf50 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
@@ -141,14 +141,14 @@ fun IntentMultiEventHomeScreen(
                 .fillMaxWidth()
                 .clickable {
                     val newValue = allCheckedState != ToggleableState.On
-                    intents.forEach { MultiEventScreenIntents.checkedStates[it.id] = newValue }
+                    MultiEventScreenIntents.checkedStates.putAll(intents.associate { it.id to newValue })
                 },
         ) {
             TriStateCheckbox(
                 state = allCheckedState,
                 onClick = {
                     val newValue = allCheckedState != ToggleableState.On
-                    intents.forEach { MultiEventScreenIntents.checkedStates[it.id] = newValue }
+                    MultiEventScreenIntents.checkedStates.putAll(intents.associate { it.id to newValue })
                 },
             )
             Text(stringResource(R.string.select_deselect_all))