diff --git a/app/models/setting.rb b/app/models/setting.rb
index d08c84a48..cf06b283e 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -150,7 +150,7 @@ reload config settings
       return true
     end
     change_id = Cache.get('Setting::ChangeId')
-    if change_id == @@change_id
+    if @@change_id && change_id == @@change_id
       @@lookup_at = Time.zone.now # rubocop:disable Style/ClassVars
       #logger.debug "Setting.cache_valid?: cache still valid, #{@@change_id}/#{change_id}"
       return true