diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 77f027d17b6..d14f025aeaa 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -518,7 +518,8 @@ module Ci
         if expire_in
           expire_in
         else
-          ApplicationSetting.current.default_artifacts_expire_in
+          Gitlab::CurrentSettings.current_application_settings
+            .default_artifacts_expire_in
         end
 
       self.artifacts_expire_in = value
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index d85afdeab42..44f69bff30d 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -638,6 +638,8 @@ describe Ci::API::Builds do
             end
 
             before do
+              stub_application_setting(default_artifacts_expiration: 0)
+
               post(post_url, post_data, headers_with_token)
             end