diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go
index 079e121f9..27e155dfa 100644
--- a/federationapi/routing/send.go
+++ b/federationapi/routing/send.go
@@ -116,6 +116,7 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, error) {
 			results[e.EventID()] = gomatrixserverlib.PDUResult{
 				Error: err.Error(),
 			}
+			util.GetLogger(t.context).Error("Failed to process incoming federation event, skipping. Event ID:", e.EventID(), " Err:", err)
 		} else {
 			results[e.EventID()] = gomatrixserverlib.PDUResult{}
 		}
diff --git a/roomserver/state/v1/state.go b/roomserver/state/v1/state.go
index 5683745bf..3eb601925 100644
--- a/roomserver/state/v1/state.go
+++ b/roomserver/state/v1/state.go
@@ -366,11 +366,16 @@ func (v StateResolutionV1) loadStateAfterEventsForNumericTuples(
 			// update that key in the result.
 			// If the requested event wasn't a state event then the state after
 			// it is the same as the state before it.
+			set := false
 			for i := range result {
 				if result[i].StateKeyTuple == prevState.StateKeyTuple {
 					result[i] = prevState.StateEntry
+					set = true
 				}
 			}
+			if !set { // no previous state exists for this event: add new state
+				result = append(result, prevState.StateEntry)
+			}
 		}
 		return result, nil
 	}