diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go
index d3b86fcbf..14fbb76eb 100644
--- a/clientapi/routing/membership.go
+++ b/clientapi/routing/membership.go
@@ -125,18 +125,18 @@ func SendMembership(
 		returnData = struct {
 			RoomID string `json:"room_id"`
 		}{roomID}
-		fallthrough
 	default:
-		_, err = producer.SendEvents(
-			req.Context(),
-			[]gomatrixserverlib.HeaderedEvent{(*event).Headered(verRes.RoomVersion)},
-			cfg.Matrix.ServerName,
-			nil,
-		)
-		if err != nil {
-			util.GetLogger(req.Context()).WithError(err).Error("producer.SendEvents failed")
-			return jsonerror.InternalServerError()
-		}
+	}
+
+	_, err = producer.SendEvents(
+		req.Context(),
+		[]gomatrixserverlib.HeaderedEvent{event.Headered(verRes.RoomVersion)},
+		cfg.Matrix.ServerName,
+		nil,
+	)
+	if err != nil {
+		util.GetLogger(req.Context()).WithError(err).Error("producer.SendEvents failed")
+		return jsonerror.InternalServerError()
 	}
 
 	return util.JSONResponse{
diff --git a/roomserver/input/membership.go b/roomserver/input/membership.go
index ee39ff5eb..e973d534e 100644
--- a/roomserver/input/membership.go
+++ b/roomserver/input/membership.go
@@ -143,7 +143,7 @@ func updateToInviteMembership(
 		// consider a single stream of events when determining whether a user
 		// is invited, rather than having to combine multiple streams themselves.
 		onie := api.OutputNewInviteEvent{
-			Event:       (*add).Headered(roomVersion),
+			Event:       add.Headered(roomVersion),
 			RoomVersion: roomVersion,
 		}
 		updates = append(updates, api.OutputEvent{