diff --git a/config/initializers/005-message_bus.rb b/config/initializers/004-message_bus.rb
similarity index 100%
rename from config/initializers/005-message_bus.rb
rename to config/initializers/004-message_bus.rb
diff --git a/config/initializers/004-site_settings.rb b/config/initializers/005-site_settings.rb
similarity index 100%
rename from config/initializers/004-site_settings.rb
rename to config/initializers/005-site_settings.rb
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 025d126f59c..703e7e9fd3b 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -295,11 +295,11 @@ module SiteSettingExtension
     clean_name = name.to_s.sub("?", "").to_sym
 
     define_singleton_method clean_name do
-      if (c = @containers[provider.current_site])
-        c[name]
-      else
+      if (c = current[name]).nil?
         refresh!
         current[name]
+      else
+        c
       end
     end