diff --git a/api/s29_scada_device.py b/api/s29_scada_device.py
index 6143b6e..6dd1dd8 100644
--- a/api/s29_scada_device.py
+++ b/api/s29_scada_device.py
@@ -113,7 +113,7 @@ def delete_scada_device(name: str, cs: ChangeSet) -> ChangeSet:
 def clean_scada_device_cmd(name: str) -> ChangeSet:
     cs = ChangeSet()
 
-    rows = read_all(name, 'select * from scada_device')
+    rows = read_all(name, 'select id from scada_device acs')
     for row in rows:
         cs.delete({ 'type': 'scada_device', 'id': row['id'] })
 
diff --git a/api/s31_scada_element.py b/api/s31_scada_element.py
index 04448a9..816256e 100644
--- a/api/s31_scada_element.py
+++ b/api/s31_scada_element.py
@@ -139,7 +139,7 @@ def delete_scada_element(name: str, cs: ChangeSet) -> ChangeSet:
 def clean_scada_element_cmd(name: str) -> ChangeSet:
     cs = ChangeSet()
 
-    rows = read_all(name, 'select * from scada_element')
+    rows = read_all(name, 'select id from scada_element acs')
     for row in rows:
         cs.delete({ 'type': 'scada_element', 'id': row['id'] })