diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts
index fc66c847f6..0472f1069a 100644
--- a/src/layouts/home-assistant-main.ts
+++ b/src/layouts/home-assistant-main.ts
@@ -12,7 +12,6 @@ import "@polymer/app-layout/app-drawer/app-drawer";
 // Not a duplicate, it's for typing
 // tslint:disable-next-line
 import { AppDrawerElement } from "@polymer/app-layout/app-drawer/app-drawer";
-import "@polymer/app-route/app-route";
 import "@polymer/iron-media-query/iron-media-query";
 
 import "./partial-panel-resolver";
diff --git a/src/util/hass-translation.ts b/src/util/hass-translation.ts
index 067392bcc0..220c0210a7 100644
--- a/src/util/hass-translation.ts
+++ b/src/util/hass-translation.ts
@@ -61,9 +61,12 @@ export function getLocalLanguage() {
   let language = null;
   if (STORAGE.selectedLanguage) {
     try {
-      language = findAvailableLanguage(JSON.parse(STORAGE.selectedLanguage));
-      if (language) {
-        return language;
+      const stored = JSON.parse(STORAGE.selectedLanguage);
+      if (stored) {
+        language = findAvailableLanguage(stored);
+        if (language) {
+          return language;
+        }
       }
     } catch (e) {
       // Ignore parsing error.