diff --git a/www/Utils.js b/www/Utils.js
index 52d24348..a2349033 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -663,14 +663,17 @@ Ext.define('PBS.Utils', {
 
 	let [type, message] = PBS.Utils.parseMaintenanceMode(mode);
 
-	const conflictingTasks = activeTasks.write + (type === 'offline' ? activeTasks.read : 0);
-
 	let extra = '';
-	if (conflictingTasks > 0) {
-	    extra += '| <i class="fa fa-spinner fa-pulse fa-fw"></i> ';
-	    extra += Ext.String.format(gettext('{0} conflicting tasks still active.'), conflictingTasks);
-	} else {
-	    extra += '<i class="fa fa-check"></i>';
+
+	if (activeTasks !== undefined) {
+	    const conflictingTasks = activeTasks.write + (type === 'offline' ? activeTasks.read : 0);
+
+	    if (conflictingTasks > 0) {
+		extra += '| <i class="fa fa-spinner fa-pulse fa-fw"></i> ';
+		extra += Ext.String.format(gettext('{0} conflicting tasks still active.'), conflictingTasks);
+	    } else {
+		extra += '<i class="fa fa-check"></i>';
+	    }
 	}
 
 	if (message) {
diff --git a/www/form/DataStoreSelector.js b/www/form/DataStoreSelector.js
index a1471a84..90f20bee 100644
--- a/www/form/DataStoreSelector.js
+++ b/www/form/DataStoreSelector.js
@@ -29,6 +29,15 @@ Ext.define('PBS.form.DataStoreSelector', {
 		renderer: Ext.String.htmlEncode,
 		flex: 1,
 	    },
+	    {
+		header: gettext('Maintenance'),
+		sortable: true,
+		dataIndex: 'maintenance',
+		renderer: (value) => {
+		    return PBS.Utils.renderMaintenance(value);
+		},
+		flex: 1,
+	    }
 	],
     },
 });