diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -399,11 +399,14 @@
 }
 
 void SQLiteQueryExecutor::rekeyMessage(std::string from, std::string to) const {
-  static std::string rekeyMessageSQL =
-      "UPDATE OR REPLACE messages "
-      "SET id = ? "
-      "WHERE id = ?";
-  rekeyAllEntities(this->getConnection(), rekeyMessageSQL, from, to);
+  constexpr std::string_view tables[] = {"messages", "backup_messages"};
+  for (const auto &table : tables) {
+    std::string rekeyMessageSQL = "UPDATE OR REPLACE " + std::string(table) +
+        " "
+        "SET id = ? "
+        "WHERE id = ?";
+    rekeyAllEntities(this->getConnection(), rekeyMessageSQL, from, to);
+  }
 }
 
 void SQLiteQueryExecutor::removeAllMedia() const {
@@ -470,9 +473,12 @@
 
 void SQLiteQueryExecutor::rekeyMediaContainers(std::string from, std::string to)
     const {
-  static std::string rekeyMediaContainersSQL =
-      "UPDATE media SET container = ? WHERE container = ?;";
-  rekeyAllEntities(this->getConnection(), rekeyMediaContainersSQL, from, to);
+  constexpr std::string_view tables[] = {"media", "backup_media"};
+  for (const auto &table : tables) {
+    std::string rekeyMediaContainersSQL = "UPDATE " + std::string(table) +
+        " SET container = ? WHERE container = ?;";
+    rekeyAllEntities(this->getConnection(), rekeyMediaContainersSQL, from, to);
+  }
 }
 
 void SQLiteQueryExecutor::replaceMessageStoreThreads(
diff --git a/web/shared-worker/_generated/comm_query_executor.wasm b/web/shared-worker/_generated/comm_query_executor.wasm
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001