diff --git a/extension/qfq/qfq/database/DatabaseUpdate.php b/extension/qfq/qfq/database/DatabaseUpdate.php
index 248aa895fe41af5f957b9f0e370eaa2cf09d90b3..4278bb8f8cda514cd0918503cacef2dd216f55d5 100644
--- a/extension/qfq/qfq/database/DatabaseUpdate.php
+++ b/extension/qfq/qfq/database/DatabaseUpdate.php
@@ -116,6 +116,8 @@ class DatabaseUpdate {
         if ($dbUpdate === SYSTEM_DB_UPDATE_ALWAYS || ($dbUpdate === SYSTEM_DB_UPDATE_AUTO && $new != $old)) {
             $this->dbUpdateStatements($old, $new);
             $this->db->playSqlFile(__DIR__ . '/../../sql/formEditor.sql');
+
+            // Finally write the latest version number.
             $this->setDatabaseVersion($new);
         }
     }
@@ -167,6 +169,8 @@ class DatabaseUpdate {
                 foreach ($sqlStatements as $sql) {
                     $this->db->sql($sql);
                 }
+                // Remember already applied updates - in case something breaks and the update has to be repeated.
+                $this->setDatabaseVersion($new);
             }
         }
     }