diff --git a/src/translation/en.json b/src/translation/en.json
index 1cb218dad..d96071d7f 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -941,7 +941,8 @@
             "usageInfo": "{{ available | prettyDiskSize }}</b> of <b>{{ size | prettyDiskSize }}</b> available",
             "diskContent": "This {{ type }} disk contains",
             "notAvailableYet": "Not available yet",
-            "usedInfo": "{{ used }} used of {{ size }}"
+            "usedInfo": "{{ used }} used of {{ size }}",
+            "uninstalledApp": "Uninstalled app"
         },
         "systemMemory": {
             "title": "System Memory",
diff --git a/src/views/system.html b/src/views/system.html
index b61d3a845..583e436bc 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -82,7 +82,10 @@
               <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 === 'standard'">{{ content.label || content.id }}</span>
-                <span ng-show="content.type === 'app'"><a href="https://{{ content.app.fqdn }}" target="_blank">{{ content.app.label || content.app.fqdn }}</a></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>
+                  <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>
                 <small class="text-muted">{{ content.usage | prettyDiskSize }}</small>
               </div>
diff --git a/src/views/system.js b/src/views/system.js
index d4292c6f8..6d7dfaff4 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -82,7 +82,10 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
                     disk.contents.forEach(function (content) {
                         content.color = getNextColor();
 
-                        if (content.type === 'app') content.app = Client.getInstalledAppsByAppId()[content.id];
+                        if (content.type === 'app') {
+                            content.app = Client.getInstalledAppsByAppId()[content.id];
+                            if (!content.app) content.uninstalled = true;
+                        }
                         if (content.type === 'volume') content.volume = $scope.volumesById[content.id];
 
                         usageOther -= content.usage;