From 5f15cf2cf883af6344111c830479fde6a2923c11 Mon Sep 17 00:00:00 2001
From: turbokongen <turbokongen@hotmail.com>
Date: Thu, 1 Sep 2016 09:06:20 +0200
Subject: [PATCH] If device was off target temp was null. Default to Heating
 setpoint

---
 homeassistant/components/climate/zwave.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/climate/zwave.py b/homeassistant/components/climate/zwave.py
index 63dddaf466bcf0..b77a97e5d9336e 100755
--- a/homeassistant/components/climate/zwave.py
+++ b/homeassistant/components/climate/zwave.py
@@ -150,7 +150,8 @@ def update_properties(self):
         # Set point
         for value in self._node.get_values(
                 class_id=COMMAND_CLASS_THERMOSTAT_SETPOINT).values():
-            if self.current_operation is not None:
+            if self.current_operation is not None and \
+               self.current_operation != 'Off':
                 if SET_TEMP_TO_INDEX.get(self._current_operation) \
                    != value.index:
                     continue