diff --git a/config/initializers/05-site_settings.rb b/config/initializers/05-site_settings.rb
index 2cd3a7c6b91..8831b731f4d 100644
--- a/config/initializers/05-site_settings.rb
+++ b/config/initializers/05-site_settings.rb
@@ -1,3 +1,8 @@
+# load up git version into memory
+# this way if it changes underneath we still have
+# the original version
+Discourse.git_version
+
 reload_settings = lambda {
   RailsMultisite::ConnectionManagement.each_connection do
     begin
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 9b87a8e1827..e1a68baf3f5 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -177,7 +177,10 @@ module SiteSettingExtension
   end
 
   def self.client_settings_cache_key
-    "client_settings_json"
+    # NOTE: we use the git version in the key to ensure
+    # that we don't end up caching the incorrect version
+    # in cases where we are cycling unicorns
+    "client_settings_json_#{Discourse.git_version}"
   end
 
   # refresh all the site settings