diff --git a/dashboard/src/views/system.html b/dashboard/src/views/system.html
index 2a8494598..c25b8f965 100644
--- a/dashboard/src/views/system.html
+++ b/dashboard/src/views/system.html
@@ -122,13 +122,13 @@
               <div ng-repeat="content in disk.contents" class="disk-content">
                 <span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span>
                 <span ng-show="content.type === 'cloudron-backup-default'">{{ content.path }} (Old Backups)</span>
-                <span ng-show="content.type === 'standard'">{{ content.label || content.id }}</span>
-                <span ng-show="content.type === 'swap'">{{ content.id }}</span>
+                <span ng-show="content.type === 'standard'">{{ content.label }}</span>
+                <span ng-show="content.type === 'swap'">{{ content.label }}</span>
                 <span ng-show="content.type === 'app'">
-                  <a href="https://{{ content.app.fqdn }}" target="_blank" ng-hide="content.uninstalled">{{ content.app.label || content.app.fqdn }}</a>
+                  <a href="https://{{ content.app.fqdn }}" target="_blank" ng-hide="content.uninstalled">{{ content.label }}</a>
                   <span ng-show="content.uninstalled">{{ 'system.diskUsage.uninstalledApp' | tr }}</span>
                 </span>
-                <span ng-show="content.type === 'volume'"><a href="/#/volumes">{{ content.volume.name }}</a></span>
+                <span ng-show="content.type === 'volume'"><a href="/#/volumes">{{ content.label }}</a></span>
                 <small class="text-muted">{{ content.usage | prettyDiskSize }}</small>
               </div>
             </div>
diff --git a/dashboard/src/views/system.js b/dashboard/src/views/system.js
index e4c5c76ab..ac9bc5738 100644
--- a/dashboard/src/views/system.js
+++ b/dashboard/src/views/system.js
@@ -96,11 +96,16 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
 
                         if (content.type === 'app') {
                             content.app = Client.getInstalledAppsByAppId()[content.id];
+                            content.label = content.app.label || content.app.fqdn;
                             if (!content.app) content.uninstalled = true;
                         } else if (content.type === 'volume') {
                             content.volume = $scope.volumesById[content.id];
+                            content.label = content.volume.name;
                         }
 
+                        // ensure a label for ui
+                        content.label = content.label || content.id;
+
                         usageOther -= content.usage;
                     });