plotly
diff --git a/‎src/plots/cartesian/axes.js
+2-2 b/‎src/plots/cartesian/axes.js
+2-2
diff --git a/‎test/image/baselines/axes_breaks-dtick_auto.png
-294 Bytes b/‎test/image/baselines/axes_breaks-dtick_auto.png
-294 Bytes
diff --git a/‎test/image/baselines/axes_breaks-dtick_hourly.png
-2.64 KB b/‎test/image/baselines/axes_breaks-dtick_hourly.png
-2.64 KB
diff --git a/‎test/image/baselines/axes_breaks-round-weekdays.png
-286 Bytes b/‎test/image/baselines/axes_breaks-round-weekdays.png
-286 Bytes
diff --git a/‎test/image/baselines/axes_breaks-weekends-weeknights.png
741 Bytes b/‎test/image/baselines/axes_breaks-weekends-weeknights.png
741 Bytes
@@ -635,9 +635,9 @@ axes.calcTicks = function calcTicks(ax) {
             var last = axrev ? len - 1 : 0;
             for(var q = first; dir * q <= dir * last; q += dir) { // apply reverse loop to pick greater values in breaks first
                 var tickVal = tickVals[q];
-                var value = tickVal.value;
-                if(ax.maskBreaks(value) === BADNUM) {
+                if(ax.maskBreaks(tickVal.value) === BADNUM) {
                     tickVal.value = moveToEndOfBreak(tickVal.value, ax);
+                    if(ax.maskBreaks(tickVal.value) === BADNUM) continue;
                 }
 
                 var pos = ax.c2p(tickVal.value);