diff --git a/src/home-assistant.html b/src/home-assistant.html
index e93b60db8c..56c549a09f 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -131,8 +131,11 @@ class HomeAssistant extends Polymer.Element {
       states: null,
       config: null,
       themes: null,
-      language: null,
-      resources: null,
+
+      // If language and resources are already loaded, don't discard them
+      language: (this.hass && this.hass.language) || null,
+      resources: (this.hass && this.hass.resources) || null,
+
       translationMetadata: window.translationMetadata,
       dockedSidebar: false,
       moreInfoEntityId: null,