diff --git a/modules/system/databaseMigration.py b/modules/system/databaseMigration.py
index 0c11632e..8d13041a 100644
--- a/modules/system/databaseMigration.py
+++ b/modules/system/databaseMigration.py
@@ -486,12 +486,14 @@ def _insertRows(
 
         try:
             with conn.cursor() as cur:
+                cur.execute("SAVEPOINT row_sp")
                 cur.execute(sql, values)
                 inserted += cur.rowcount
+                cur.execute("RELEASE SAVEPOINT row_sp")
         except Exception as e:
             logger.warning("Insert failed for %s row: %s", tableName, e)
-            conn.rollback()
-            conn.autocommit = False
+            with conn.cursor() as cur:
+                cur.execute("ROLLBACK TO SAVEPOINT row_sp")
 
     return inserted