diff --git a/internal/persistence/sql/traverser.go b/internal/persistence/sql/traverser.go
index 4d38479b6..d125b9320 100644
--- a/internal/persistence/sql/traverser.go
+++ b/internal/persistence/sql/traverser.go
@@ -127,6 +127,8 @@ LIMIT ?
 }
 
 func (t *Traverser) TraverseSubjectSetRewrite(ctx context.Context, start *relationtuple.RelationTuple, computedSubjectSets []string) (res []*relationtuple.TraversalResult, err error) {
+	ctx, span := t.d.Tracer(ctx).Tracer().Start(ctx, "persistence.sql.TraverseSubjectSetRewrite")
+	defer otelx.End(span, &err)
 
 	namespaceManager, err := t.d.Config(ctx).NamespaceManager()
 	if err != nil {
@@ -145,9 +147,6 @@ func (t *Traverser) TraverseSubjectSetRewrite(ctx context.Context, start *relati
 	}
 
 	if len(relations) > 0 {
-		_, span := t.d.Tracer(ctx).Tracer().Start(ctx, "persistence.sql.TraverseSubjectSetRewrite")
-		defer otelx.End(span, &err)
-
 		var rows relationTuples
 
 		query := t.p.queryWithNetwork(ctx)
diff --git a/internal/swagger_types.go b/internal/swagger_types.go
index e5d198744..9aea9a242 100644
--- a/internal/swagger_types.go
+++ b/internal/swagger_types.go
@@ -3,7 +3,7 @@
 
 package internal
 
-// Empty responses are sent when, for example, resources are deleted. The HTTP status code for empty responses is typically 201.
+// Empty responses are sent when, for example, resources are deleted. The HTTP status code for empty responses is typically 204.
 //
 // swagger:response emptyResponse
 // nolint:deadcode,unused