diff --git a/app/src/main/java/org/linhome/ui/devices/edit/DeviceEditorFragment.kt b/app/src/main/java/org/linhome/ui/devices/edit/DeviceEditorFragment.kt
index 21b5ec56959ae4b3b791ebe1b928d42ab3a53786..1a0ca1e6bfaffd098dc2af1e518a10cb2cd8c2e2 100644
--- a/app/src/main/java/org/linhome/ui/devices/edit/DeviceEditorFragment.kt
+++ b/app/src/main/java/org/linhome/ui/devices/edit/DeviceEditorFragment.kt
@@ -43,6 +43,7 @@ import org.linhome.entities.Action
 import org.linhome.store.DeviceStore
 import org.linhome.ui.validators.ValidatorFactory
 import org.linhome.utils.DialogUtil
+import org.linhome.utils.cdlog
 
 class DeviceEditorFragment : GenericFragment() {
 
@@ -71,11 +72,13 @@ class DeviceEditorFragment : GenericFragment() {
 
         model.device = args.device
 
-        if (model.device == null) {
-            addAction(null)
-        } else {
-            model.device!!.actions?.forEach {
-                addAction(it)
+        if (model.actionsViewModels.isEmpty()) {
+            if (model.device == null) {
+                addAction(null)
+            } else {
+                model.device!!.actions?.forEach {
+                    addAction(it)
+                }
             }
         }