diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index f3b9dcacde..5d88a601de 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -1,10 +1,14 @@
 module Gitlab
   module CurrentSettings
     def current_application_settings
-      if ActiveRecord::Base.connection.table_exists?('application_settings')
-        ApplicationSetting.current ||
-          ApplicationSetting.create_from_defaults
-      else
+      begin
+        if ActiveRecord::Base.connection.table_exists?('application_settings')
+          ApplicationSetting.current ||
+            ApplicationSetting.create_from_defaults
+        else
+          fake_application_settings
+        end
+      rescue ActiveRecord::NoDatabaseError
         fake_application_settings
       end
     end