diff --git a/dashboard/src/js/logs.js b/dashboard/src/js/logs.js
index 327c42826..ccf6fdf20 100644
--- a/dashboard/src/js/logs.js
+++ b/dashboard/src/js/logs.js
@@ -17,6 +17,7 @@ app.controller('LogsController', ['$scope', '$translate', 'Client', function ($s
     $scope.lines = 100;
     $scope.selectedAppInfo = null;
     $scope.selectedTaskInfo = null;
+    $scope.error = false;
 
     function ab2str(buf) {
         return String.fromCharCode.apply(null, new Uint16Array(buf));
@@ -180,13 +181,16 @@ app.controller('LogsController', ['$scope', '$translate', 'Client', function ($s
                     if (error) return Client.initError(error, init);
 
                     select({ id: search.id, taskId: search.taskId, appId: search.appId, crashId: search.crashId }, function (error) {
-                        if (error) return Client.initError(error, init);
+                        $scope.initialized = true;
+
+                        if (error) {
+                            $scope.error = true;
+                            return Client.initError(error, init);
+                        }
 
                         // now mark the Client to be ready
                         Client.setReady();
 
-                        $scope.initialized = true;
-
                         showLogs();
                     });
                 });
diff --git a/dashboard/src/logs.html b/dashboard/src/logs.html
index 6599e8107..04348d79d 100644
--- a/dashboard/src/logs.html
+++ b/dashboard/src/logs.html
@@ -65,7 +65,8 @@
   <a class="offline-banner animateMe" ng-show="client.offline" ng-cloak href="https://docs.cloudron.io/troubleshooting/" target="_blank"><i class="fa fa-circle-notch fa-spin"></i> {{ 'main.offline' | tr }}</a>
 
   <div class="animateMe ng-hide layout-root" ng-show="initialized">
-    <div class="logs-controls">
+    <div ng-show="error" class="logs-error">{{ 'logs.notFoundError' | tr }}</div>
+    <div ng-hide="error" class="logs-controls">
       <h3 style="display: inline-block;">{{ selected.name }}</h3>
 
       <!-- logs actions -->
diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index 2ed68a915..32bd1d112 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -1761,6 +1761,14 @@ tag-input {
 .logs {
     background: black;
 
+    .logs-error {
+        color: white;
+        width: 100%;
+        font-size: 18px;
+        text-align: center;
+        margin-top: 200px;
+    }
+
     .logs-controls {
         margin: 5px;
 
diff --git a/dashboard/src/translation/en.json b/dashboard/src/translation/en.json
index 3d1610e7b..80a36c8d8 100644
--- a/dashboard/src/translation/en.json
+++ b/dashboard/src/translation/en.json
@@ -1072,7 +1072,8 @@
     "logs": {
         "title": "Logs",
         "clear": "Clear View",
-        "download": "Download Full Logs"
+        "download": "Download Full Logs",
+        "notFoundError": "No such task or app"
     },
     "terminal": {
         "title": "Terminal",
diff --git a/dashboard/src/translation/nl.json b/dashboard/src/translation/nl.json
index 12e9110da..1eb88b181 100644
--- a/dashboard/src/translation/nl.json
+++ b/dashboard/src/translation/nl.json
@@ -1227,7 +1227,13 @@
         },
         "configureIpv6": {
             "title": "Configureer IPv6 aanbieder"
-        }
+        },
+        "trustedIps": {
+            "description": "HTTP headers van bijbehorende IP adressen worden vertrouwd",
+            "summary": "{{ trustCount }} IP’s vertrouwd",
+            "title": "Configureer vertrouwde IP’s"
+        },
+        "trustedIpRanges": "Vertrouwde IP’s & bereiken "
     },
     "services": {
         "title": "Diensten",
diff --git a/dashboard/src/translation/ru.json b/dashboard/src/translation/ru.json
index 474b19534..a7807319a 100644
--- a/dashboard/src/translation/ru.json
+++ b/dashboard/src/translation/ru.json
@@ -1136,7 +1136,12 @@
         },
         "configureIpv6": {
             "title": "Настройка IPv6"
-        }
+        },
+        "trustedIps": {
+            "summary": "{{ trustCount }} IP доверены",
+            "title": "Настроить доверенные IP"
+        },
+        "trustedIpRanges": "Доверенные IP и диапазоны "
     },
     "services": {
         "title": "Службы",