1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 1baed674a8..fd40b44a9a 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -158,14 +158,16 @@ class SearchStore(BackgroundUpdateStore):
                 )
                 conn.set_session(autocommit=False)
 
-                pg = dict(progress)
-                pg["have_added_indexes"] = True
+            yield self.runWithConnection(create_index)
 
-                self._background_update_progress_txn(
-                    conn.cursor(), self.EVENT_SEARCH_ORDER_UPDATE_NAME, progress
-                )
+            pg = dict(progress)
+            pg["have_added_indexes"] = True
 
-            yield self.runWithConnection(create_index)
+            yield self.runInteraction(
+                self.EVENT_SEARCH_ORDER_UPDATE_NAME,
+                self._background_update_progress_txn,
+                self.EVENT_SEARCH_ORDER_UPDATE_NAME, progress,
+            )
 
         INSERT_CLUMP_SIZE = 1000