diff --git a/js/glowingbear.js b/js/glowingbear.js
index b0a1093..32aed94 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -520,7 +520,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         // the messages in this buffer before you switched to the new one
         // this is only needed with new type of clearing since in the old
         // way WeeChat itself takes care of that part
-        if (models.version[0] >= 1) {
+        if (settings.hotlistsync && models.version[0] >= 1) {
             connection.sendHotlistClear();
         }
 
diff --git a/js/inputbar.js b/js/inputbar.js
index 2d6054a..ceb2265 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -200,7 +200,7 @@ weechat.directive('inputBar', function() {
                 }
 
                 // New style clearing requires this, old does not
-                if (models.version[0] >= 1) {
+                if (settings.hotlistsync && models.version[0] >= 1) {
                     connection.sendHotlistClear();
                 }