diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json
index e7d40c32a1..db0fe6fffa 100644
--- a/demo-shell/resources/i18n/en.json
+++ b/demo-shell/resources/i18n/en.json
@@ -257,5 +257,17 @@
     }
   },
   "GROUP-TITLE1-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION ONE",
-  "GROUP-TITLE2-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION TWO"
+  "GROUP-TITLE2-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION TWO",
+  "ERROR_CONTENT": {
+    "507": {
+      "TITLE": "ACS Disk full",
+      "DESCRIPTION": "Content exceeds overall storage quota limit configured for the network or system",
+      "SECONDARY_BUTTON": {
+        "TEXT": ""
+      },
+      "RETURN_BUTTON": {
+        "TEXT": "Back to home"
+      }
+    }
+  }
 }
diff --git a/demo-shell/src/app/app.component.ts b/demo-shell/src/app/app.component.ts
index 6fceae8c50..e24b06cd0c 100644
--- a/demo-shell/src/app/app.component.ts
+++ b/demo-shell/src/app/app.component.ts
@@ -45,6 +45,13 @@ export class AppComponent implements OnInit {
                     this.router.navigate(['/login']);
                 }
             }
+
+            if (error.status === 507) {
+                if (!this.authenticationService.isLoggedIn()) {
+                    this.dialogRef.closeAll();
+                    this.router.navigate(['error/507']);
+                }
+            }
         });
     }
 }