diff --git a/userapi/consumers/roomserver.go b/userapi/consumers/roomserver.go
index 4b4d0a1c7..f3d5b87a0 100644
--- a/userapi/consumers/roomserver.go
+++ b/userapi/consumers/roomserver.go
@@ -99,7 +99,9 @@ func (s *OutputRoomEventConsumer) onMessage(ctx context.Context, msgs []*nats.Ms
 		return true
 	}
 
-	go s.storeMessageStats(ctx, event.Type(), event.Sender(), event.RoomID())
+	if s.cfg.Matrix.ReportStats.Enabled {
+		go s.storeMessageStats(ctx, event.Type(), event.Sender(), event.RoomID())
+	}
 
 	log.WithFields(log.Fields{
 		"event_id":   event.EventID(),