diff --git a/src/views/app.js b/src/views/app.js
index 85cc1c091..79fbdfc5b 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -667,7 +667,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 $scope.graphs[chartPropertyName] = new Chart(ctx, { type: 'line', data: data, options: options });
             }
 
-            var memoryQuery = 'summarize(collectd.localhost.table-' + appId + '-memory.gauge-rss, "' + timeBucketSize + 'min", "avg")';
+            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, diskQuery ], '-' + timePeriod + 'min', {}, function (error, result) {