diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go
index cc67bf7fa..a7b516761 100644
--- a/federationapi/routing/invite.go
+++ b/federationapi/routing/invite.go
@@ -80,11 +80,7 @@ func InviteV3(
 					return rsAPI.QueryUserIDForSender(httpReq.Context(), roomID, senderID)
 				},
 			},
-			Origin:           request.Origin(),
 			InviteProtoEvent: inviteReq.Event(),
-			SenderIDQuerier: func(roomID spec.RoomID, userID spec.UserID) (spec.SenderID, error) {
-				return rsAPI.QuerySenderIDForUser(httpReq.Context(), roomID, userID)
-			},
 			GetOrCreateSenderID: func(ctx context.Context, userID spec.UserID, roomID spec.RoomID, roomVersion string) (spec.SenderID, ed25519.PrivateKey, error) {
 				// assign a roomNID, otherwise we can't create a private key for the user
 				_, nidErr := rsAPI.AssignRoomNID(ctx, roomID, gomatrixserverlib.RoomVersion(roomVersion))
diff --git a/go.mod b/go.mod
index 24a3524a7..0a8ebc389 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e
 	github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91
 	github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
-	github.com/matrix-org/gomatrixserverlib v0.0.0-20230630201258-2564ca79770c
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20230630202451-23f29e58fd42
 	github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a
 	github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
 	github.com/mattn/go-sqlite3 v1.14.16
diff --git a/go.sum b/go.sum
index 565ab590c..029597718 100644
--- a/go.sum
+++ b/go.sum
@@ -323,8 +323,8 @@ github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91 h1:s7fexw
 github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91/go.mod h1:e+cg2q7C7yE5QnAXgzo512tgFh1RbQLC0+jozuegKgo=
 github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 h1:kHKxCOLcHH8r4Fzarl4+Y3K5hjothkVW5z7T1dUM11U=
 github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s=
-github.com/matrix-org/gomatrixserverlib v0.0.0-20230630201258-2564ca79770c h1:FgkrAhxHB0i+CDQAi/lq5KSMJO4ceqtbg4IK11+L4rc=
-github.com/matrix-org/gomatrixserverlib v0.0.0-20230630201258-2564ca79770c/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20230630202451-23f29e58fd42 h1:Z/DiG6ixB3l7TSD7ix/cb8zf6/6H1YGA2Y+Oev+sfI4=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20230630202451-23f29e58fd42/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU=
 github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a h1:awrPDf9LEFySxTLKYBMCiObelNx/cBuv/wzllvCCH3A=
 github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a/go.mod h1:HchJX9oKMXaT2xYFs0Ha/6Zs06mxLU8k6F1ODnrGkeQ=
 github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 h1:6z4KxomXSIGWqhHcfzExgkH3Z3UkIXry4ibJS4Aqz2Y=
diff --git a/roomserver/version/version.go b/roomserver/version/version.go
index 5e44971b0..270d42897 100644
--- a/roomserver/version/version.go
+++ b/roomserver/version/version.go
@@ -23,7 +23,6 @@ import (
 // DefaultRoomVersion contains the room version that will, by
 // default, be used to create new rooms on this server.
 func DefaultRoomVersion() gomatrixserverlib.RoomVersion {
-	//return gomatrixserverlib.RoomVersionPseudoIDs
 	return gomatrixserverlib.RoomVersionV10
 }