diff --git a/src/translation/en.json b/src/translation/en.json
index 28d9a6043..2568df998 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1436,7 +1436,8 @@
                 "30d": "30 days",
                 "6h": "6 hours"
             },
-            "memoryTitle": "Memory (RAM + Swap) in MB"
+            "memoryTitle": "Memory (RAM + Swap) in MB",
+            "diskTitle": "Disk Usage"
         },
         "email": {
             "from": {
diff --git a/src/views/app.html b/src/views/app.html
index a74d33e2a..272d79bd8 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1055,6 +1055,8 @@
             </div>
             <label style="margin-top: 10px;">{{ 'app.graphs.memoryTitle' | tr }}</label>
             <canvas id="graphsMemoryChart" style="width: 100%;"></canvas>
+            <label style="margin-top: 10px;">{{ 'app.graphs.diskTitle' | tr }}</label>
+            <canvas id="graphsDiskChart" style="width: 100%;"></canvas>
           </div>
         </div>
       </div>
diff --git a/src/views/app.js b/src/views/app.js
index 087252c78..8133c685e 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -874,13 +874,15 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             }
 
             var memoryQuery = 'summarize(sum(collectd.localhost.table-' + appId + '-memory.gauge-rss, collectd.localhost.table-' + appId + '-memory.gauge-swap), "' + timeBucketSize + 'min", "avg")';
+            var diskQuery = 'summarize(collectd.localhost.du-' + appId + '.capacity-usage, "' + timeBucketSize + 'min", "avg")';
 
-            Client.graphs([ memoryQuery ], '-' + timePeriod + 'min', { appId: appId }, function (error, result) {
+            Client.graphs([ memoryQuery, diskQuery ], '-' + timePeriod + 'min', { appId: appId }, function (error, result) {
                 if (error) return console.error(error);
 
                 var currentMemoryLimit = $scope.app.memoryLimit || $scope.app.manifest.memoryLimit || (256 * 1024 * 1024);
 
                 fillGraph('#graphsMemoryChart', result[0], 'Memory', 'memoryChart', currentMemoryLimit / 1024 / 1024);
+                fillGraph('#graphsDiskChart', result[1], 'Disk', 'diskChart', 1024 / 1024);
             });
         }
     };