diff --git a/futurehome/config.yaml b/futurehome/config.yaml
index 3c7b3cf..0fb6955 100644
--- a/futurehome/config.yaml
+++ b/futurehome/config.yaml
@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: Futurehome
-version: "0.0.36"
+version: "0.0.37"
 slug: futurehome
 description: Local Futurehome Smarthub integration
 url: "https://github.com/adrianjagielak/home-assistant-futurehome"
diff --git a/futurehome/src/ha/publish_device.ts b/futurehome/src/ha/publish_device.ts
index e02399b..f0535fb 100644
--- a/futurehome/src/ha/publish_device.ts
+++ b/futurehome/src/ha/publish_device.ts
@@ -209,6 +209,7 @@ const serviceHandlers: {
 
 export function haPublishDevice(parameters: {
   hubId: string;
+  demoMode: boolean;
   vinculumDeviceData: VinculumPd7Device;
   deviceInclusionReport: InclusionReport | undefined;
 }): { commandHandlers: CommandHandlers } {
@@ -249,7 +250,7 @@ export function haPublishDevice(parameters: {
     Object.assign(handlers, result.commandHandlers);
   }
 
-  if (demoMode) {
+  if (parameters.demoMode) {
     // Apply optimistic override
     for (const component of Object.values(components)) {
       if ((component as any).optimistic === false) {
diff --git a/futurehome/src/index.ts b/futurehome/src/index.ts
index ec5c959..151534e 100644
--- a/futurehome/src/index.ts
+++ b/futurehome/src/index.ts
@@ -144,6 +144,7 @@ import { delay } from './utils';
 
         const result = haPublishDevice({
           hubId,
+          demoMode,
           vinculumDeviceData,
           deviceInclusionReport,
         });