diff --git a/app/models/project.rb b/app/models/project.rb
index 798f3dfe853..085ab6e467a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -469,7 +469,7 @@ class Project < ActiveRecord::Base
   end
 
   def auto_devops_enabled?
-    if auto_devops
+    if auto_devops && !auto_devops.enabled.nil?
       auto_devops.enabled?
     else
       current_application_settings.auto_devops_enabled?