diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index cb4671d51e2..b7b4d155932 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -233,7 +233,7 @@ main_loop(struct server_config *config,
 
         SHASH_FOR_EACH_SAFE (node, all_dbs) {
             struct db *db = node->data;
-            ovsdb_txn_history_run(db->db);
+
             ovsdb_storage_run(db->db->storage);
             read_db(config, db);
             /* Run triggers after storage_run and read_db to make sure new raft
@@ -663,6 +663,7 @@ parse_txn(struct server_config *config, struct db *db,
         if (!error && !uuid_is_zero(txnid)) {
             db->db->prereq = *txnid;
         }
+        ovsdb_txn_history_run(db->db);
     }
     return error;
 }
diff --git a/ovsdb/relay.c b/ovsdb/relay.c
index 94ffe01e54e..5a2b4b3b665 100644
--- a/ovsdb/relay.c
+++ b/ovsdb/relay.c
@@ -400,6 +400,7 @@ ovsdb_relay_run(void)
             }
             ovsdb_cs_event_destroy(event);
         }
+        ovsdb_txn_history_run(ctx->db);
     }
 }