diff --git a/cmd/backfill/main.go b/cmd/backfill/main.go
index eb19f883f..a856557eb 100644
--- a/cmd/backfill/main.go
+++ b/cmd/backfill/main.go
@@ -24,6 +24,7 @@ var requestTo = flag.String("to", "", "the server name to start backfilling from
 var startEventID = flag.String("eventid", "", "the event ID to start backfilling from")
 var roomID = flag.String("room", "", "the room ID to backfill")
 
+// nolint: gocyclo
 func main() {
 	flag.Parse()
 
@@ -98,7 +99,7 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer f.Close()
+	defer f.Close() // nolint: errcheck
 	seenEvents := make(map[string]struct{})
 
 	encoder := json.NewEncoder(f)
diff --git a/go.mod b/go.mod
index 44de606fb..129576c64 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-20230301150509-5f7577968b8f
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20230307091615-c09404be6e15
 	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.15
diff --git a/go.sum b/go.sum
index 040403a36..591442f2a 100644
--- a/go.sum
+++ b/go.sum
@@ -325,6 +325,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20230131183213-122f1e0e3fa1 h1:JS
 github.com/matrix-org/gomatrixserverlib v0.0.0-20230131183213-122f1e0e3fa1/go.mod h1:Mtifyr8q8htcBeugvlDnkBcNUy5LO8OzUoplAf1+mb4=
 github.com/matrix-org/gomatrixserverlib v0.0.0-20230301150509-5f7577968b8f h1:gJQy+K/OYxAycj5rs0/7U2R4/Cx+XfkdERRLjIOQmZ4=
 github.com/matrix-org/gomatrixserverlib v0.0.0-20230301150509-5f7577968b8f/go.mod h1:Mtifyr8q8htcBeugvlDnkBcNUy5LO8OzUoplAf1+mb4=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20230307091615-c09404be6e15 h1:7ywZ3mH1EUWo9SvkikCz99EmYixjBNAAKRDnwXpJS3Q=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20230307091615-c09404be6e15/go.mod h1:Mtifyr8q8htcBeugvlDnkBcNUy5LO8OzUoplAf1+mb4=
 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=