diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index 76fd41f4bf229f012384e5856bf0516b8c854e2a..c6107315210941d9c17f5f11f28bd80e786c7474 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -815,7 +815,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
 
         // We hide the app until we are either fully logged in or logged out
         // At the same time when we hide the main app we show the main slot (e.g. a loading spinner)
-        const appHidden = (this._loginStatus == 'unknown' || this._loginStatus == 'logging-in');
+        const appHidden = (this._loginStatus === 'unknown' || this._loginStatus === 'logging-in');
         const mainClassMap = classMap({hidden: appHidden});
         const slotClassMap = classMap({hidden: !appHidden});
 
@@ -885,6 +885,10 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
                 </aside>
 
                 <main>
+                    <div style="display: ${this.description === null ? 'none' : 'block'};">
+                        <h2>${i18n.t('page-not-found')}</h2>
+                        <p>${i18n.t('choose-from-menu')}</p>
+                    </div>
                     <p class="description">${this.description}</p>
                     ${ this._renderActivity() }
                 </main>
diff --git a/packages/app-shell/src/i18n/de/translation.json b/packages/app-shell/src/i18n/de/translation.json
index d8212b8e0af7a79a61757bc01b78fafea2367615..bac3fc0fb57a6b6e8ce32746ef1bd4556f5837cd 100644
--- a/packages/app-shell/src/i18n/de/translation.json
+++ b/packages/app-shell/src/i18n/de/translation.json
@@ -15,5 +15,7 @@
       "headline": "Willkommen bei der Applikation '{{appname}}'."
   },
   "login": "Einloggen",
-  "logout": "Ausloggen"
+  "logout": "Ausloggen",
+  "page-not-found": "Die gewünschte Seite wurde nicht gefunden",
+  "choose-from-menu": "Bitte wählen Sie eine Aktivität aus dem Menu."
 }
\ No newline at end of file
diff --git a/packages/app-shell/src/i18n/en/translation.json b/packages/app-shell/src/i18n/en/translation.json
index e1195f1128bc16c8c540fc4e08df45d18c1280f8..5a5c20a43596e8d667e64f6647716b11e4c0207f 100644
--- a/packages/app-shell/src/i18n/en/translation.json
+++ b/packages/app-shell/src/i18n/en/translation.json
@@ -15,5 +15,7 @@
       "headline": "Welcome to the '{{appname}}' application."
   },
   "login": "Login",
-  "logout": "Logout"
+  "logout": "Logout",
+  "page-not-found": "Requested Page Not Found",
+  "choose-from-menu": "Please choose an activity from the menu."
 }