diff --git a/assets/js/dxwaterfall.js b/assets/js/dxwaterfall.js
index 34e33b705..86a1d1fc4 100644
--- a/assets/js/dxwaterfall.js
+++ b/assets/js/dxwaterfall.js
@@ -2970,7 +2970,7 @@ var dxWaterfall = {
             var middleFreq = this.getCachedMiddleFreq();
             // Use 20kHz margin for band detection (extends band edges)
             bandToUse = frequencyToBandKhz(middleFreq, 20);
-            if (bandToUse === 'All') {
+            if (!bandToUse) {
                 return null; // Out of band and no spots loaded
             }
         }
@@ -3055,7 +3055,7 @@ var dxWaterfall = {
         } else {
             // Use 20kHz margin for band detection (extends band edges)
             bandToDraw = frequencyToBandKhz(middleFreq, 20);
-            if (bandToDraw === 'All') {
+            if (!bandToDraw) {
                 return; // Out of band and no spots loaded, don't draw
             }
         }
@@ -5184,7 +5184,7 @@ var dxWaterfall = {
         // Check if we're out of band (using 20kHz margin)
         var currentFreqKhz = this.getCachedMiddleFreq();
         var detectedBand = frequencyToBandKhz(currentFreqKhz, 20);
-        var isOutOfBand = (detectedBand === 'All');
+        var isOutOfBand = (!detectedBand);
 
         if (isOutOfBand && (!this.currentSpotBand || this.currentSpotBand === 'All')) {
             // Out of band with no spots loaded - show "Out of band" message