diff --git a/roomserver/api/input.go b/roomserver/api/input.go
index 4b0704b9f..45a9ef497 100644
--- a/roomserver/api/input.go
+++ b/roomserver/api/input.go
@@ -42,6 +42,19 @@ const (
 	KindOld
 )
 
+func (k Kind) String() string {
+	switch k {
+	case KindOutlier:
+		return "KindOutlier"
+	case KindNew:
+		return "KindNew"
+	case KindOld:
+		return "KindOld"
+	default:
+		return "(unknown)"
+	}
+}
+
 // DoNotSendToOtherServers tells us not to send the event to other matrix
 // servers.
 const DoNotSendToOtherServers = ""
diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index 147103cf5..16703616e 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -93,8 +93,16 @@ func (r *Inputer) processRoomEvent(
 	logger := util.GetLogger(ctx).WithFields(logrus.Fields{
 		"event_id": event.EventID(),
 		"room_id":  event.RoomID(),
+		"kind":     input.Kind,
+		"origin":   input.Origin,
 		"type":     event.Type(),
 	})
+	if input.HasState {
+		logger = logger.WithFields(logrus.Fields{
+			"has_state": input.HasState,
+			"state_ids": len(input.StateEventIDs),
+		})
+	}
 
 	// if we have already got this event then do not process it again, if the input kind is an outlier.
 	// Outliers contain no extra information which may warrant a re-processing.