From b03c3611984ca0753a87fe4d989ed8e1f85d90a5 Mon Sep 17 00:00:00 2001
From: Andrey <andrey-git@users.noreply.github.com>
Date: Sat, 17 Mar 2018 00:38:27 +0200
Subject: [PATCH] When /states/bad_view is selected - fall back to default
 view. (#1002)

---
 src/layouts/partial-cards.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/layouts/partial-cards.html b/src/layouts/partial-cards.html
index 9eadcb8dba..0166a60dd5 100644
--- a/src/layouts/partial-cards.html
+++ b/src/layouts/partial-cards.html
@@ -183,7 +183,7 @@
 
         currentView: {
           type: String,
-          computed: '_computeCurrentView(routeMatch, routeData)',
+          computed: '_computeCurrentView(hass, routeMatch, routeData)',
         },
 
         views: {
@@ -288,8 +288,12 @@
       }
     }
 
-    _computeCurrentView(routeMatch, routeData) {
-      return routeMatch ? routeData.view : '';
+    _computeCurrentView(hass, routeMatch, routeData) {
+      if (!routeMatch) return '';
+      if (!hass.states[routeData.view] || !hass.states[routeData.view].attributes.view) {
+        return '';
+      }
+      return routeData.view;
     }
 
     computeTitle(views, defaultView, locationName) {