diff --git a/frontend/javascripts/frontend.js b/frontend/javascripts/frontend.js
index 2b2d26c..fd9cf7f 100644
--- a/frontend/javascripts/frontend.js
+++ b/frontend/javascripts/frontend.js
@@ -191,6 +191,15 @@ vz.handleControls = function () {
 			break;
 	}
 	
+	// update delta after zoom
+	delta = vz.options.plot.xaxis.max - vz.options.plot.xaxis.min;
+	
+	// we dont want to zoom/pan into the future
+	if (vz.options.plot.xaxis.max + delta > new Date().getTime()) {
+		vz.options.plot.xaxis.max = new Date().getTime();
+		vz.options.plot.xaxis.min = new Date().getTime() - delta;
+	}
+	
 	vz.entities.loadData();
 };