diff --git a/app/assets/javascripts/discourse/app/initializers/user-tips.js b/app/assets/javascripts/discourse/app/initializers/user-tips.js
index c72c85c151f4c..63c3bc1fbe09b 100644
--- a/app/assets/javascripts/discourse/app/initializers/user-tips.js
+++ b/app/assets/javascripts/discourse/app/initializers/user-tips.js
@@ -30,6 +30,10 @@ export default {
 
   @bind
   onMessage(seenUserTips) {
+    if (!this.site.user_tips) {
+      return;
+    }
+
     this.currentUser.set("seen_popups", seenUserTips);
 
     if (!this.currentUser.user_option) {
diff --git a/config/site_settings.yml b/config/site_settings.yml
index efdcc93adb9f1..d5fae71101afa 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -386,6 +386,7 @@ basic:
   enable_user_tips:
     client: true
     default: true
+    refresh: true
 
 login:
   invite_only: