diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index d6d99e098..5ca1be118 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -129,11 +129,6 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent(
 	ctx context.Context, msg api.OutputNewRoomEvent,
 ) error {
 	ev := msg.Event
-	if msg.Type == api.OutputRoomState {
-		s.notifyKeyChanges(&ev)
-		return nil
-	}
-
 	addsStateEvents := msg.AddsState()
 
 	ev, err := s.updateStateEvent(ev)
@@ -155,7 +150,7 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent(
 		msg.AddsStateEventIDs,
 		msg.RemovesStateEventIDs,
 		msg.TransactionID,
-		false,
+		msg.Type == api.OutputRoomState,
 	)
 	if err != nil {
 		// panic rather than continue with an inconsistent database