diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py

index 8ae70e2b12..d7a6850789 100644
--- a/synapse/replication/tcp/streams/_base.py
+++ b/synapse/replication/tcp/streams/_base.py
@@ -421,7 +421,7 @@ class AccountDataStream(Stream):
         results = list(room_results)
         results.extend(
             (stream_id, user_id, None, account_data_type)
-            for stream_id, user_id, account_data_type in global_results
+            for stream_id, user_id, account_data_type, content in global_results
         )
 
         return results
diff --git a/synapse/storage/data_stores/main/account_data.py b/synapse/storage/data_stores/main/account_data.py

index a270bb753a..6afbfc0d74 100644
--- a/synapse/storage/data_stores/main/account_data.py
+++ b/synapse/storage/data_stores/main/account_data.py
@@ -191,7 +191,7 @@ class AccountDataWorkerStore(SQLBaseStore):
 
         def get_updated_account_data_txn(txn):
             sql = (
-                "SELECT stream_id, user_id, account_data_type"
+                "SELECT stream_id, user_id, account_data_type, content"
                 " FROM account_data WHERE ? < stream_id AND stream_id <= ?"
                 " ORDER BY stream_id ASC LIMIT ?"
             )
@@ -199,7 +199,7 @@ class AccountDataWorkerStore(SQLBaseStore):
             global_results = txn.fetchall()
 
             sql = (
-                "SELECT stream_id, user_id, room_id, account_data_type"
+                "SELECT stream_id, user_id, room_id, account_data_type, content"
                 " FROM room_account_data WHERE ? < stream_id AND stream_id <= ?"
                 " ORDER BY stream_id ASC LIMIT ?"
             )