diff --git a/central/graphql/resolvers/clusters.go b/central/graphql/resolvers/clusters.go
index fb8710c6fee05..1f865bea128ab 100644
--- a/central/graphql/resolvers/clusters.go
+++ b/central/graphql/resolvers/clusters.go
@@ -698,9 +698,6 @@ func (resolver *clusterResolver) clusterScopeContext(ctx context.Context) contex
 	if resolver.ctx == nil {
 		resolver.ctx = ctx
 	}
-	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		resolver.ctx = ctx
-	}
 	return scoped.Context(resolver.ctx, scoped.Scope{
 		Level: v1.SearchCategory_CLUSTERS,
 		ID:    resolver.data.GetId(),
diff --git a/central/graphql/resolvers/deployments.go b/central/graphql/resolvers/deployments.go
index ab890c014743b..f5412424bb3e1 100644
--- a/central/graphql/resolvers/deployments.go
+++ b/central/graphql/resolvers/deployments.go
@@ -612,9 +612,6 @@ func (resolver *deploymentResolver) deploymentScopeContext(ctx context.Context)
 	if resolver.ctx == nil {
 		resolver.ctx = ctx
 	}
-	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		resolver.ctx = ctx
-	}
 	return scoped.Context(resolver.ctx, scoped.Scope{
 		Level: v1.SearchCategory_DEPLOYMENTS,
 		ID:    resolver.data.GetId(),
diff --git a/central/graphql/resolvers/image_components.go b/central/graphql/resolvers/image_components.go
index 3dbcb4a0f7c75..a9b4d7664ace1 100644
--- a/central/graphql/resolvers/image_components.go
+++ b/central/graphql/resolvers/image_components.go
@@ -195,9 +195,6 @@ func (resolver *imageComponentResolver) imageComponentScopeContext(ctx context.C
 	if resolver.ctx == nil {
 		resolver.ctx = ctx
 	}
-	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		resolver.ctx = ctx
-	}
 	return scoped.Context(resolver.ctx, scoped.Scope{
 		Level: v1.SearchCategory_IMAGE_COMPONENTS,
 		ID:    resolver.data.GetId(),
diff --git a/central/graphql/resolvers/images.go b/central/graphql/resolvers/images.go
index a7be3fe7405a4..379e7b67fa744 100644
--- a/central/graphql/resolvers/images.go
+++ b/central/graphql/resolvers/images.go
@@ -364,9 +364,6 @@ func (resolver *imageResolver) imageScopeContext(ctx context.Context) context.Co
 	if resolver.ctx == nil {
 		resolver.ctx = ctx
 	}
-	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		resolver.ctx = ctx
-	}
 	return scoped.Context(resolver.ctx, scoped.Scope{
 		Level: v1.SearchCategory_IMAGES,
 		ID:    resolver.data.GetId(),
diff --git a/central/graphql/resolvers/namespaces.go b/central/graphql/resolvers/namespaces.go
index d2e94297237ee..26171e5f632b0 100644
--- a/central/graphql/resolvers/namespaces.go
+++ b/central/graphql/resolvers/namespaces.go
@@ -531,9 +531,6 @@ func (resolver *namespaceResolver) namespaceScopeContext(ctx context.Context) co
 	if resolver.ctx == nil {
 		resolver.ctx = ctx
 	}
-	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		resolver.ctx = ctx
-	}
 	return scoped.Context(resolver.ctx, scoped.Scope{
 		Level: v1.SearchCategory_NAMESPACES,
 		ID:    resolver.data.GetMetadata().GetId(),
diff --git a/central/graphql/resolvers/node_components.go b/central/graphql/resolvers/node_components.go
index 5552aafbc7eb4..edc4e19283ee5 100644
--- a/central/graphql/resolvers/node_components.go
+++ b/central/graphql/resolvers/node_components.go
@@ -163,7 +163,7 @@ func (resolver *nodeComponentResolver) nodeComponentScopeContext(ctx context.Con
 		resolver.ctx = ctx
 	}
 	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		return scoped.Context(ctx, scoped.Scope{
+		return scoped.Context(resolver.ctx, scoped.Scope{
 			Level: v1.SearchCategory_IMAGE_COMPONENTS,
 			ID:    resolver.data.GetId(),
 		})
diff --git a/central/graphql/resolvers/nodes.go b/central/graphql/resolvers/nodes.go
index 3947b6595529c..c9eeb4c085d00 100644
--- a/central/graphql/resolvers/nodes.go
+++ b/central/graphql/resolvers/nodes.go
@@ -539,9 +539,6 @@ func (resolver *nodeResolver) nodeScopeContext(ctx context.Context) context.Cont
 	if resolver.ctx == nil {
 		resolver.ctx = ctx
 	}
-	if !env.PostgresDatastoreEnabled.BooleanSetting() {
-		resolver.ctx = ctx
-	}
 	return scoped.Context(resolver.ctx, scoped.Scope{
 		Level: v1.SearchCategory_NODES,
 		ID:    resolver.data.GetId(),