diff --git a/syncapi/storage/shared/storage_sync.go b/syncapi/storage/shared/storage_sync.go
index d69bbc67a..67cd0c89b 100644
--- a/syncapi/storage/shared/storage_sync.go
+++ b/syncapi/storage/shared/storage_sync.go
@@ -816,8 +816,8 @@ func (d *DatabaseTransaction) SelectMultiRoomData(ctx context.Context, r *types.
 			mr[row.UserId] = make(map[string]types.MultiRoomData)
 		}
 		mr[row.UserId][row.Type] = types.MultiRoomData{
-			Content:   row.Data,
-			Timestamp: row.Timestamp,
+			Content:        row.Data,
+			OriginServerTs: row.Timestamp,
 		}
 	}
 	return mr, nil
diff --git a/syncapi/types/multiroom.go b/syncapi/types/multiroom.go
index f1b5d7e49..782c40b81 100644
--- a/syncapi/types/multiroom.go
+++ b/syncapi/types/multiroom.go
@@ -5,8 +5,8 @@ type MultiRoom map[string]map[string]MultiRoomData
 type MultiRoomContent []byte
 
 type MultiRoomData struct {
-	Content   MultiRoomContent `json:"content"`
-	Timestamp int64            `json:"timestamp"`
+	Content        MultiRoomContent `json:"content"`
+	OriginServerTs int64            `json:"origin_server_ts"`
 }
 
 func (d MultiRoomContent) MarshalJSON() ([]byte, error) {
diff --git a/syncapi/types/multiroom_test.go b/syncapi/types/multiroom_test.go
index 7fa906974..53f637dd8 100644
--- a/syncapi/types/multiroom_test.go
+++ b/syncapi/types/multiroom_test.go
@@ -13,8 +13,8 @@ func TestMarshallMultiRoom(t *testing.T) {
 		MultiRoom{
 			"@3:example.com": map[string]MultiRoomData{
 				"location": {
-					Content:   MultiRoomContent(`{"foo":"bar"}`),
-					Timestamp: 123,
+					Content:        MultiRoomContent(`{"foo":"bar"}`),
+					OriginServerTs: 123,
 				}}})
 	is.NoErr(err)
 	is.Equal(m, []byte(`{"@3:example.com":{"location":{"content":{"foo":"bar"},"timestamp":123}}}`))