1 files changed, 10 insertions, 5 deletions
diff --git a/iosApp/iosApp/Devices/DevicesViewModel.swift b/iosApp/iosApp/Devices/DevicesViewModel.swift
index 76cf9a2..f252ad2 100644
--- a/iosApp/iosApp/Devices/DevicesViewModel.swift
+++ b/iosApp/iosApp/Devices/DevicesViewModel.swift
@@ -18,6 +18,7 @@
 import Foundation
 import shared
 
+@MainActor
 class DevicesViewModel: ObservableObject {
     var unitsViewModel: UnitsViewModel
     var id: Int32? = nil
@@ -35,14 +36,18 @@ class DevicesViewModel: ObservableObject {
     }
     
     func select(unit: UnitInformation) {
-        unitsViewModel.searchQuery = ""
-        unitsViewModel.isEditing = false
-        unitsViewModel.unitsDisplayMode = .map
-        unitsViewModel.selectedUnit = unit
+        Task { @MainActor in
+            unitsViewModel.searchQuery = ""
+            unitsViewModel.isEditing = false
+            unitsViewModel.unitsDisplayMode = .map
+            unitsViewModel.selectedUnit = unit
+        }
         
     }
     
     func show(action: DeviceRow.Action, for unit: UnitInformation) {
-        unitsViewModel.show(action: action, for: unit)
+        Task { @MainActor in
+            unitsViewModel.show(action: action, for: unit)
+        }
     }
 }