diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 3f7d1bee33c..231b1ecaf42 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -158,7 +158,7 @@ function graphDirective(timeSrv, popoverSrv, contextSrv) {
 
       function processRangeHook(plot) {
         var yaxis = plot.getYAxes();
-        if (yaxis.length > 1 && panel.yaxes[1].align !== null) {
+        if (yaxis.length > 1 && 'align' in panel.yaxes[1] && panel.yaxes[1].align !== null) {
           alignYLevel(yaxis, parseFloat(panel.yaxes[1].align));
         }
       }
diff --git a/public/vendor/flot/jquery.flot.js b/public/vendor/flot/jquery.flot.js
index 401198b712d..8ee09e25c41 100644
--- a/public/vendor/flot/jquery.flot.js
+++ b/public/vendor/flot/jquery.flot.js
@@ -1633,7 +1633,7 @@ Licensed under the MIT license.
                         measureTickLabels(axis);
                     });
 
-                    if (snaped) {
+                    if (snaped && hooks.processRange.length > 0) {
                         executeHooks(hooks.processRange, []);
                         snaped = false;
                     } else {