diff --git a/CHANGELOG b/CHANGELOG
index 2ec3bd28b39..789fd58d5c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.0.0 (unreleased)
   - Fixed login failure when extern_uid changes (Joel Koglin)
   - Don't notify users without access to the project when they are (accidentally) mentioned in a note.
   - Retrieving oauth token with LDAP credentials
+  - Load Application settings from running database unless env var USE_DB=false
 
 v 7.14.1
   - Improve abuse reports management from admin area
@@ -112,7 +113,7 @@ v 7.13.4
 v 7.13.3
   - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
   - Allow users to send abuse reports
-  - Remove satellites 
+  - Remove satellites
   - Link username to profile on Group Members page (Tom Webster)
 
 v 7.13.2
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 7ad3ed8728f..0ea1b6a2f6f 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -4,7 +4,7 @@ module Gitlab
       key = :current_application_settings
 
       RequestStore.store[key] ||= begin
-        if ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
+        if connect_to_db?
           ApplicationSetting.current || ApplicationSetting.create_from_defaults
         else
           fake_application_settings
@@ -26,5 +26,17 @@ module Gitlab
         import_sources: Settings.gitlab['import_sources']
       )
     end
+
+    private
+
+    def connect_to_db?
+      use_db = if ENV['USE_DB'] == "false"
+                 false
+               else
+                 true
+               end
+
+      use_db && ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
+    end
   end
 end