diff --git a/package.json b/package.json
index 40dafcc175..cd378d36d7 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "classnames": "^2.2.5",
-    "home-assistant-js": "git+https://github.com/home-assistant/home-assistant-js.git#261d260ba185b384632f7db9058ef436ecdcb97f",
+    "home-assistant-js": "git+https://github.com/home-assistant/home-assistant-js.git#a6f5188db0a1eaad613ce29bb3b803f111e73746",
     "moment": "^2.13.0"
   },
   "devDependencies": {
diff --git a/src/app-core.js b/src/app-core.js
index e83ba6b949..f440ed9250 100644
--- a/src/app-core.js
+++ b/src/app-core.js
@@ -1,6 +1,5 @@
 import HomeAssistant from 'home-assistant-js';
 
-// While we figure out how ha-entity-marker can keep it's references
 const hass = new HomeAssistant();
 
 window.validateAuth = function validateAuth(authToken, rememberAuth) {
@@ -32,4 +31,5 @@ hass.reactor.batch(function () {
 
 setTimeout(hass.startLocalStoragePreferencesSync, 5000);
 
+// While we figure out how ha-entity-marker can keep it's references
 window.hass = hass;
diff --git a/webpack.config.js b/webpack.config.js
index b88d2e5aed..7326e4cbbc 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,6 +10,7 @@ module.exports = {
   entry: {
     _ui_compiled: './src/home-assistant.js',
     _core_compiled: './src/app-core.js',
+    _demo_data_compiled: './node_modules/home-assistant-js/demo_data/expose_window.js',
   },
   output: {
     path: 'build',
@@ -22,6 +23,7 @@ module.exports = {
         test: /.js$/,
         include: [
           path.resolve(__dirname, 'src'),
+          path.resolve(__dirname, 'node_modules/home-assistant-js/demo_data'),
           path.resolve(__dirname, 'node_modules/home-assistant-js/src'),
         ],
       },