diff --git a/roomserver/internal/perform_backfill.go b/roomserver/internal/perform_backfill.go
index 03644a7c8..721f66106 100644
--- a/roomserver/internal/perform_backfill.go
+++ b/roomserver/internal/perform_backfill.go
@@ -162,6 +162,7 @@ func (b *backfillRequester) StateBeforeEvent(ctx context.Context, roomVer gomatr
 // It returns a list of servers which can be queried for backfill requests. These servers
 // will be servers that are in the room already. The entries at the beginning are preferred servers
 // and will be tried first. An empty list will fail the request.
+// nolint:gocyclo
 func (b *backfillRequester) ServersAtEvent(ctx context.Context, roomID, eventID string) []gomatrixserverlib.ServerName {
 	// eventID will be a prev_event ID of a backwards extremity, meaning we will not have a database entry for it. Instead, use
 	// its successor, so look it up.
diff --git a/roomserver/internal/query.go b/roomserver/internal/query.go
index 14f79773a..f8e8ba04d 100644
--- a/roomserver/internal/query.go
+++ b/roomserver/internal/query.go
@@ -397,6 +397,7 @@ func (r *RoomserverInternalAPI) checkServerAllowedToSeeEvent(
 }
 
 // QueryMissingEvents implements api.RoomserverInternalAPI
+// nolint:gocyclo
 func (r *RoomserverInternalAPI) QueryMissingEvents(
 	ctx context.Context,
 	request *api.QueryMissingEventsRequest,
diff --git a/roomserver/state/state.go b/roomserver/state/state.go
index 7b545bea6..37e6807a3 100644
--- a/roomserver/state/state.go
+++ b/roomserver/state/state.go
@@ -349,11 +349,11 @@ func (v StateResolution) LoadStateAfterEventsForStringTuples(
 	if err != nil {
 		return nil, err
 	}
-	return v.loadStateAfterEventsForNumericTuples(ctx, v.roomInfo.RoomNID, prevStates, numericTuples)
+	return v.loadStateAfterEventsForNumericTuples(ctx, prevStates, numericTuples)
 }
 
 func (v StateResolution) loadStateAfterEventsForNumericTuples(
-	ctx context.Context, roomNID types.RoomNID,
+	ctx context.Context,
 	prevStates []types.StateAtEvent,
 	stateKeyTuples []types.StateKeyTuple,
 ) ([]types.StateEntry, error) {