diff --git a/src/github.com/matrix-org/dendrite/clientapi/sync/syncserver.go b/src/github.com/matrix-org/dendrite/clientapi/sync/syncserver.go
index 77f7c7f41..1c97c6a3b 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/sync/syncserver.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/sync/syncserver.go
@@ -64,7 +64,8 @@ func (s *Server) onMessage(msg *sarama.ConsumerMessage) error {
 	}).Info("received event from roomserver")
 
 	if err := s.db.WriteEvent(&ev, output.AddsStateEventIDs, output.RemovesStateEventIDs); err != nil {
-		log.WithError(err).Errorf("roomserver output log: write event failure")
+		// panic rather than continue with an inconsistent database
+		log.WithError(err).WithField("OutputRoomEvent", output).Panicf("roomserver output log: write event failure")
 		return nil
 	}