diff --git a/climate/emma-bedroom/processing.js b/climate/emma-bedroom/processing.js
index ec1518f..7384104 100644
--- a/climate/emma-bedroom/processing.js
+++ b/climate/emma-bedroom/processing.js
@@ -150,8 +150,10 @@ if (time === 'day') {
         setEco = 'turn_off'
         if (schedMode === 'AC') {
             setHvac = 'cool'
+            setDisplay = 'turn_off'
         } else if (schedMode === 'Fan') {
             setHvac = "fan_only"
+            setDisplay = 'turn_off'
         } else if (schedMode === 'White Noise') {
             setWhiteNoise = 'turn_on'
             if (ac === 'on') {
@@ -320,14 +322,14 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
     } else {
         if (topic === 'emmabedroom-cooling' && ac === 'on') {
             node.status({ fill: "green", shape: "dot", text: "Cooling Schedule" })
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null])
             node.log("Emma Bedroom Climate: Auto/Cooling")
         } else if (topic === 'emmabedroom-bedtime') {
             node.send([null, sendPeople, null])
             node.status({ fill: "green", shape: "dot", text: "Bedtime" })
             node.log("Emma Bedroom Climate: Auto/Bedtime")
             if (validSchedModesAC.includes(schedMode) && ac === 'on') {
-                node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null])
+                node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null])
                 node.log("Emma Bedroom Climate: Auto/Bedtime/AC")
             } else if (schedMode === 'White Noise') {
                 node.send([null, sendWhiteNoise, null])
@@ -341,7 +343,7 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
                 node.send([null, sendWhiteNoise, null])
                 node.log("Emma Bedroom Climate: Auto/Wakeup/Sleep Off")
                 if (ac === 'on') {
-                    node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null])
+                    node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null])
                     node.log("Emma Bedroom Climate: Auto/Wakeup/AC On")
                 }
             } else if (sleeping === 'on') {
@@ -358,7 +360,7 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
         node.status({ fill: "blue", shape: "dot", text: "Manual Night" })
         node.log("Emma Bedroom Climate: Manual/Night")
         if (ac === 'on') {
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null])
             node.log("Emma Bedroom Climate: Manual/Night/AC")
         }
     } else if (time === 'day') {
@@ -366,14 +368,14 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
         node.send([null, sendWhiteNoise, null])
         node.log("Emma Bedroom Climate: Manual/Day")
         if (ac === 'on') {
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null])
             node.log("Emma Bedroom Climate: Manual/Day/AC")
         }
     } else if (time === 'bedtime') {
         node.status({ fill: "blue", shape: "dot", text: "Manual Bedtime" })
         node.log("Emma Bedroom Climate: Manual/Bedtime")
         if (validSchedModesAC.includes(schedMode) && ac === 'on') {
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null])
             node.log("Emma Bedroom Climate: Manual/Bedtime/AC")
         } else if (schedMode === 'White Noise') {
             node.send([null, sendWhiteNoise, null])
diff --git a/climate/master-bedroom/processing.js b/climate/master-bedroom/processing.js
index 6ec9a84..7ba21ed 100644
--- a/climate/master-bedroom/processing.js
+++ b/climate/master-bedroom/processing.js
@@ -180,8 +180,10 @@ if (time === 'day') {
         setEco = 'turn_off'
         if (acMode === 'AC') {
             setHvac = 'cool'
+            setDisplay = 'turn_off'
         } else if (acMode === 'Fan') {
             setHvac = "fan_only"
+            setDisplay = 'turn_off'
         } else {
             setHvac = "off"
         }
@@ -352,14 +354,14 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
     } else {
         if (topic === 'mrbedroom-cooling' && ac === 'on') {
             node.status({ fill: "green", shape: "dot", text: "Cooling Schedule" })
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null, null])
             node.log("Master Bedroom Climate: Auto/Cooling")
         } else if (topic === 'mrbedroom-bedtime') {
             node.send([null, null, sendPeople, null, null])
             node.status({ fill: "green", shape: "dot", text: "Bedtime" })
             node.log("Master Bedroom Climate: Auto/Bedtime")
             if (ac === 'on') {
-                node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
+                node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
                 node.log("Master Bedroom Climate: Auto/Bedtime/AC")
             }
             if (fanMode === 'fan') {
@@ -379,7 +381,7 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
                 node.send([null, sendFan, null, null, null])
                 node.log("Master Bedroom Climate: Auto/Wakeup/Sleep Off")
                 if (ac === 'on') {
-                    node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
+                    node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
                     node.log("Master Bedroom Climate: Auto/Wakeup/AC On")
                 }
             } else if (sleeping === 'on') {
@@ -397,7 +399,7 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
         node.send([null, sendFan, null, null, null])
         node.log("Master Bedroom Climate: Manual/Night")
         if (ac === 'on') {
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
             node.log("Master Bedroom Climate: Manual/Night/AC")
         }
     } else if (time === 'day') {
@@ -405,7 +407,7 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
         node.send([null, sendFan, null, null, null])
         node.log("Master Bedroom Climate: Manual/Day")
         if (ac === 'on') {
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
             node.log("Master Bedroom Climate: Manual/Day/AC")
         }
     } else if (time === 'bedtime') {
@@ -413,7 +415,7 @@ if (type === 'auto' && allowed === 'on' && meltdown === 'off' && vacation === 'o
         node.send([null, sendFan, null, null, null])
         node.log("Master Bedroom Climate: Manual/Bedtime")
         if (ac === 'on') {
-            node.send([[sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
+            node.send([[sendDisplay, sendHvac, sendTemp, sendAcFan, sendEco], null, null, null, null])
             node.log("Master Bedroom Climate: Manual/Bedtime/AC")
         }
     }