diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index 0a5bfc182..1c914ea47 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -328,15 +328,11 @@ function setupUI() {
     if (plContents.text() !== 'Empty playlist') {
         if (shuffleButton.hasClass('ui-state-disabled')) {
             shuffleButton.removeClass('ui-state-disabled');
-        }
-        if (shuffleButton.attr('disabled') !== undefined) {
             shuffleButton.removeAttr('disabled');
         }
     } else if (!shuffleButton.hasClass('ui-state-disabled')) {
-        if (shuffleButton.attr('disabled') === undefined) {
-            shuffleButton.attr('disabled', 'disabled');
-            shuffleButton.addClass('ui-state-disabled');
-        }
+        shuffleButton.addClass('ui-state-disabled');
+        shuffleButton.attr('disabled', 'disabled');
     }
     
     var dynamic_length = target_length;