diff --git a/api/database.py b/api/database.py
index 0eb1668..c043d03 100644
--- a/api/database.py
+++ b/api/database.py
@@ -112,21 +112,21 @@ def get_current_operation(name: str) -> int:
     return int(read(name, 'select id from current_operation')['id'])
 
 
-def execute_command(name: str, command: DbChangeSet) -> ChangeSet:
-    op_table = read(name, "select * from operation_table")['option']
-
+def execute_command(name: str, command: DbChangeSet, undo_redo: bool = True) -> ChangeSet:
     write(name, command.redo_sql)
 
-    parent = get_current_operation(name)
-    redo_sql = command.redo_sql.replace("'", "''")
-    undo_sql = command.undo_sql.replace("'", "''")
-    redo_cs_str = str(command.redo_cs).replace("'", "''")
-    undo_cs_str = str(command.undo_cs).replace("'", "''")
-    write(name, f"insert into {op_table} (id, redo, undo, parent, redo_cs, undo_cs) values (default, '{redo_sql}', '{undo_sql}', {parent}, '{redo_cs_str}', '{undo_cs_str}')")
+    if undo_redo:
+        op_table = read(name, "select * from operation_table")['option']
+        parent = get_current_operation(name)
+        redo_sql = command.redo_sql.replace("'", "''")
+        undo_sql = command.undo_sql.replace("'", "''")
+        redo_cs_str = str(command.redo_cs).replace("'", "''")
+        undo_cs_str = str(command.undo_cs).replace("'", "''")
+        write(name, f"insert into {op_table} (id, redo, undo, parent, redo_cs, undo_cs) values (default, '{redo_sql}', '{undo_sql}', {parent}, '{redo_cs_str}', '{undo_cs_str}')")
 
-    if op_table == 'operation':
-        current = read(name, 'select max(id) as id from operation')['id']
-        write(name, f"update current_operation set id = {current}")
+        if op_table == 'operation':
+            current = read(name, 'select max(id) as id from operation')['id']
+            write(name, f"update current_operation set id = {current}")
 
     return ChangeSet.from_list(command.redo_cs)
 
diff --git a/api/s29_scada_device.py b/api/s29_scada_device.py
index 3038ae4..2f3ac18 100644
--- a/api/s29_scada_device.py
+++ b/api/s29_scada_device.py
@@ -71,7 +71,7 @@ def _set_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
 def set_scada_device(name: str, cs: ChangeSet) -> ChangeSet:
     if get_scada_device(name, cs.operations[0]['id']) == {}:
         return ChangeSet()
-    return execute_command(name, _set_scada_device(name, cs))
+    return execute_command(name, _set_scada_device(name, cs), False)
 
 
 def _add_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
@@ -89,7 +89,7 @@ def _add_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
 def add_scada_device(name: str, cs: ChangeSet) -> ChangeSet:
     if get_scada_device(name, cs.operations[0]['id']) != {}:
         return ChangeSet()
-    return execute_command(name, _add_scada_device(name, cs))
+    return execute_command(name, _add_scada_device(name, cs), False)
 
 
 def _delete_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
@@ -107,7 +107,7 @@ def _delete_scada_device(name: str, cs: ChangeSet) -> DbChangeSet:
 def delete_scada_device(name: str, cs: ChangeSet) -> ChangeSet:
     if get_scada_device(name, cs.operations[0]['id']) == {}:
         return ChangeSet()
-    return execute_command(name, _delete_scada_device(name, cs))
+    return execute_command(name, _delete_scada_device(name, cs), False)
 
 
 def get_all_scada_device_ids(name: str) -> list[str]:
diff --git a/api/s30_scada_device_data.py b/api/s30_scada_device_data.py
index 5f23800..d1a6043 100644
--- a/api/s30_scada_device_data.py
+++ b/api/s30_scada_device_data.py
@@ -45,7 +45,7 @@ def _set_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
-    return execute_command(name, _set_scada_device_data(name, cs))
+    return execute_command(name, _set_scada_device_data(name, cs), False)
 
 
 def _add_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet:
@@ -66,7 +66,7 @@ def add_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
     row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'")
     if row != None:
         return ChangeSet()
-    return execute_command(name, _add_scada_device_data(name, cs))
+    return execute_command(name, _add_scada_device_data(name, cs), False)
 
 
 def _delete_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet:
@@ -87,4 +87,4 @@ def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet:
     row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'")
     if row == None:
         return ChangeSet()
-    return execute_command(name, _delete_scada_device_data(name, cs))
+    return execute_command(name, _delete_scada_device_data(name, cs), False)