diff --git a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go
index 65fabd53c..6a59ce852 100644
--- a/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go
+++ b/syncapi/storage/postgres/deltas/2022061412000000_history_visibility_column.go
@@ -27,7 +27,8 @@ func LoadAddHistoryVisibilityColumn(m *sqlutil.Migrations) {
 
 func UpAddHistoryVisibilityColumn(tx *sql.Tx) error {
 	_, err := tx.Exec(`
-		ALTER TABLE syncapi_output_room_events ADD COLUMN IF NOT EXISTS history_visibility SMALLINT NOT NULL DEFAULT 3;
+		ALTER TABLE syncapi_output_room_events ADD COLUMN IF NOT EXISTS history_visibility SMALLINT NOT NULL DEFAULT 2;
+		UPDATE syncapi_output_room_events SET history_visibility = 4 WHERE type IN ('m.room.message', 'm.room.encrypted');
 	`)
 	if err != nil {
 		return fmt.Errorf("failed to execute upgrade: %w", err)
@@ -37,7 +38,7 @@ func UpAddHistoryVisibilityColumn(tx *sql.Tx) error {
 
 func DownAddHistoryVisibilityColumn(tx *sql.Tx) error {
 	_, err := tx.Exec(`
-		ALTER TABLE syncapi_output_room_events DROP COLUMN IF EXISTS sent_by_token;
+		ALTER TABLE syncapi_output_room_events DROP COLUMN IF EXISTS history_visibility;
 	`)
 	if err != nil {
 		return fmt.Errorf("failed to execute downgrade: %w", err)
diff --git a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go
index 06b75e9b7..5084b7e99 100644
--- a/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go
+++ b/syncapi/storage/sqlite3/deltas/2022061412000000_history_visibility_column.go
@@ -33,7 +33,8 @@ func UpAddHistoryVisibilityColumn(tx *sql.Tx) error {
 		return nil
 	}
 	_, err = tx.Exec(`
-		ALTER TABLE syncapi_output_room_events ADD COLUMN history_visibility SMALLINT NOT NULL DEFAULT 3;
+		ALTER TABLE syncapi_output_room_events ADD COLUMN history_visibility SMALLINT NOT NULL DEFAULT 2;
+		UPDATE syncapi_output_room_events SET history_visibility = 4 WHERE type IN ('m.room.message', 'm.room.encrypted');
 	`)
 	if err != nil {
 		return fmt.Errorf("failed to execute upgrade: %w", err)