1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/projects/container_repository/cleanup_tags_service.rb b/app/services/projects/container_repository/cleanup_tags_service.rb
index 1a788abac12..72f3fddb4c3 100644
--- a/app/services/projects/container_repository/cleanup_tags_service.rb
+++ b/app/services/projects/container_repository/cleanup_tags_service.rb
@@ -145,12 +145,14 @@ module Projects
       end
 
       def caching_enabled?
-        container_expiration_policy &&
-          older_than.present?
+        result = ::Gitlab::CurrentSettings.current_application_settings.container_registry_expiration_policies_caching &&
+                 container_expiration_policy &&
+                 older_than.present?
+        !!result
       end
 
       def throttling_enabled?
-        Feature.enabled?(:container_registry_expiration_policies_throttling)
+        Feature.enabled?(:container_registry_expiration_policies_throttling, default_enabled: :yaml)
       end
 
       def max_list_size