diff --git a/src/views/app.js b/src/views/app.js
index e67d5ce1f..ef5343e59 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -607,6 +607,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             var timeBucketSize = $scope.graphs.period > 24 ? (6*60) : 5;
 
             function fillGraph(canvasId, data, label, chartPropertyName, max) {
+                if (!data) return; // no data available yet
+
                 // translate the data from bytes to MB
                 var datapoints = data.datapoints.map(function (d) { return parseInt((d[0] / 1024 / 1024).toFixed(2)); });
                 var labels = datapoints.map(function (d, index) {