diff --git a/internal/caching/cache_roomevents.go b/internal/caching/cache_roomevents.go
index 5f5875940..8afef42db 100644
--- a/internal/caching/cache_roomevents.go
+++ b/internal/caching/cache_roomevents.go
@@ -17,7 +17,5 @@ func (c Caches) GetRoomServerEvent(eventNID types.EventNID) (*gomatrixserverlib.
 }
 
 func (c Caches) StoreRoomServerEvent(eventNID types.EventNID, event *gomatrixserverlib.Event) {
-	if event != nil {
-		c.RoomServerEvents.Set(int64(eventNID), event)
-	}
+	c.RoomServerEvents.Set(int64(eventNID), event)
 }
diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go
index 297b5b3ea..ead5762c1 100644
--- a/roomserver/storage/shared/storage.go
+++ b/roomserver/storage/shared/storage.go
@@ -487,16 +487,15 @@ func (d *Database) events(
 		result.EventNID = eventJSON.EventNID
 		roomNID := roomNIDs[result.EventNID]
 		roomVersion := roomVersions[roomNID]
-		event, err := gomatrixserverlib.NewEventFromTrustedJSONWithEventID(
+		result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID(
 			eventIDs[eventJSON.EventNID], eventJSON.EventJSON, false, roomVersion,
 		)
 		if err != nil {
 			return nil, err
 		}
-		if event != nil {
-			d.Cache.StoreRoomServerEvent(eventJSON.EventNID, event)
+		if result.Event != nil {
+			d.Cache.StoreRoomServerEvent(result.EventNID, result.Event)
 		}
-		result.Event = event
 	}
 	if !redactionsArePermanent {
 		d.applyRedactions(results)