diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js
index b87272177fc..85962a5e976 100644
--- a/src/scales/scale.linearbase.js
+++ b/src/scales/scale.linearbase.js
@@ -47,10 +47,10 @@ module.exports = function(Chart) {
 				}
 			}
 
-			if (me.min === me.max) {
+			while (me.min >= me.max) {
 				me.max++;
 
-				if (!tickOpts.beginAtZero) {
+				if (tickOpts.min === undefined && !tickOpts.beginAtZero) {
 					me.min--;
 				}
 			}