diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
index 85d3e74c83..4d3d0cff5b 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
@@ -598,7 +598,7 @@ private boolean bulkValidate(List<ResolvedPolarisEntity> toValidate) {
               refreshedResolvedEntity =
                   result.isSuccess()
                       ? new ResolvedPolarisEntity(
-                          this.polarisCallContext.getDiagServices(),
+                          this.diagnostics,
                           result.getEntity() != null ? result.getEntity() : entity,
                           result.getEntityGrantRecords() != null
                               ? result.getEntityGrantRecords()
@@ -1020,7 +1020,7 @@ private ResolvedPolarisEntity resolveByName(
 
       resolvedEntity =
           new ResolvedPolarisEntity(
-              this.polarisCallContext.getDiagServices(),
+              this.diagnostics,
               result.getEntity(),
               result.getEntityGrantRecords(),
               result.getGrantRecordsVersion());
@@ -1077,7 +1077,7 @@ private ResolvedPolarisEntity resolveById(
 
       ResolvedPolarisEntity resolvedEntity =
           new ResolvedPolarisEntity(
-              this.polarisCallContext.getDiagServices(),
+              this.diagnostics,
               result.getEntity(),
               result.getEntityGrantRecords(),
               result.getGrantRecordsVersion());