diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 22ad7ef8c8b..2c5660df373 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -1,14 +1,10 @@
 module Gitlab
   module CurrentSettings
     def current_application_settings
-      begin
-        if ActiveRecord::Base.connection.table_exists?('application_settings')
-          ApplicationSetting.current ||
-            ApplicationSetting.create_from_defaults
-        else
-          fake_application_settings
-        end
-      rescue ActiveRecord::NoDatabaseError, database_adapter.constantize::Error
+      if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('application_settings')
+        ApplicationSetting.current ||
+          ApplicationSetting.create_from_defaults
+      else
         fake_application_settings
       end
     end
@@ -22,16 +18,5 @@ module Gitlab
         sign_in_text: Settings.extra['sign_in_text'],
       )
     end
-
-    # We need to check which database is setup
-    # but we cannot assume that the database exists already.
-    # Not checking this will break "rake gitlab:setup".
-    def database_adapter
-      if Rails.configuration.database_configuration[Rails.env]['adapter'] == 'mysql2'
-        "Mysql2"
-      else
-        "PG"
-      end
-    end
   end
 end