diff --git a/src/Microsoft.Health.Fhir.Shared.Core/Features/Validation/ProfileValidator.cs b/src/Microsoft.Health.Fhir.Shared.Core/Features/Validation/ProfileValidator.cs
index 9ed39c7be6..ccf7e573b3 100644
--- a/src/Microsoft.Health.Fhir.Shared.Core/Features/Validation/ProfileValidator.cs
+++ b/src/Microsoft.Health.Fhir.Shared.Core/Features/Validation/ProfileValidator.cs
@@ -27,7 +27,7 @@ public ProfileValidator(IProvideProfilesForValidation profilesResolver, IOptions
 
             try
             {
-                _resolver = new MultiResolver(new CachedResolver(ZipSource.CreateValidationSource(), options.Value.CacheDurationInSeconds), profilesResolver);
+                _resolver = new SnapshotSource(new MultiResolver(new CachedResolver(ZipSource.CreateValidationSource(), options.Value.CacheDurationInSeconds), profilesResolver));
             }
             catch (Exception)
             {
@@ -41,7 +41,7 @@ private Validator GetValidator()
             var ctx = new ValidationSettings()
             {
                 ResourceResolver = _resolver,
-                GenerateSnapshot = true,
+                GenerateSnapshot = false,
                 Trace = false,
                 ResolveExternalReferences = false,
             };