diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 27a340a3b1f..af3516425d1 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -548,8 +548,8 @@ module.exports = function(Chart) {
 
 			if (timestamps.length) {
 				timestamps = arrayUnique(timestamps).sort(sorter);
-				min = Math.min(min, timestamps[0]);
-				max = Math.max(max, timestamps[timestamps.length - 1]);
+				min = min === MAX_INTEGER ? timestamps[0] : min;
+				max = max === MIN_INTEGER ? timestamps[timestamps.length - 1] : max;
 			}
 
 			// In case there is no valid min/max, let's use today limits