diff --git a/src/api2/node/rrd.rs b/src/api2/node/rrd.rs
index e2370b3d..ccfe61ec 100644
--- a/src/api2/node/rrd.rs
+++ b/src/api2/node/rrd.rs
@@ -29,7 +29,7 @@ fn get_node_stats(
 
     crate::rrd::extract_data(
         "host",
-        &["cpu", "iowait", "memtotal", "memused", "netin", "netout"],
+        &["cpu", "iowait", "memtotal", "memused", "swaptotal", "swapused", "netin", "netout"],
         timeframe,
         cf,
     )
diff --git a/www/DataStoreStatus.js b/www/DataStoreStatus.js
index 55719828..323be2e0 100644
--- a/www/DataStoreStatus.js
+++ b/www/DataStoreStatus.js
@@ -29,6 +29,8 @@ Ext.define('pve-rrd-node', {
 	'netout',
 	'memtotal',
 	'memused',
+	'swaptotal',
+	'swapused',
 	{ type: 'date', dateFormat: 'timestamp', name: 'time' }
     ]
 });
@@ -41,6 +43,8 @@ Ext.define('PBS.DataStoreStatus', {
     title: gettext('Data Store Status'),
     tbar: ['->', { xtype: 'proxmoxRRDTypeSelector' } ],
 
+    scrollable: true,
+
     initComponent: function() {
         var me = this;
 
@@ -76,6 +80,13 @@ Ext.define('PBS.DataStoreStatus', {
 		    fieldTitles: [gettext('Total'), gettext('RAM usage')],
 		    store: rrdstore
 		},
+		{
+		    xtype: 'proxmoxRRDChart',
+		    title: gettext('Swap usage'),
+		    fields: ['swaptotal','swapused'],
+		    fieldTitles: [gettext('Total'), gettext('Swap usage')],
+		    store: rrdstore
+		},
 		{
 		    xtype: 'proxmoxRRDChart',
 		    title: gettext('Network traffic'),