diff --git a/userapi/consumers/roomserver.go b/userapi/consumers/roomserver.go
index 56acb7b1f..8e04a7d10 100644
--- a/userapi/consumers/roomserver.go
+++ b/userapi/consumers/roomserver.go
@@ -112,6 +112,11 @@ func (s *OutputRoomEventConsumer) onMessage(ctx context.Context, msgs []*nats.Ms
 			event = output.NewInviteEvent.Event
 		}
 
+		if event == nil {
+			log.Errorf("userapi consumer: expected event")
+			return true
+		}
+
 		log.WithFields(log.Fields{
 			"event_id":   event.EventID(),
 			"event_type": event.Type(),
@@ -120,11 +125,6 @@ func (s *OutputRoomEventConsumer) onMessage(ctx context.Context, msgs []*nats.Ms
 		return true
 	}
 
-	if event == nil {
-		log.Errorf("userapi consumer: expected event")
-		return true
-	}
-
 	if s.cfg.Matrix.ReportStats.Enabled {
 		go s.storeMessageStats(ctx, event.Type(), string(event.SenderID()), event.RoomID().String())
 	}