diff --git a/homeassistant/components/lutron/light.py b/homeassistant/components/lutron/light.py
index 138d4882446..cae2fc5cfdd 100644
--- a/homeassistant/components/lutron/light.py
+++ b/homeassistant/components/lutron/light.py
@@ -34,7 +34,6 @@ class LutronLight(LutronDevice, Light):
     def __init__(self, area_name, lutron_device, controller):
         """Initialize the light."""
         self._prev_brightness = None
-        self._is_on = False
         super().__init__(area_name, lutron_device, controller)
 
     @property
@@ -78,6 +77,5 @@ class LutronLight(LutronDevice, Light):
 
     def update(self):
         """Call when forcing a refresh of the device."""
-        self._is_on = self._lutron_device.level > 0
         if self._prev_brightness is None:
             self._prev_brightness = to_hass_level(self._lutron_device.level)
diff --git a/homeassistant/components/lutron/switch.py b/homeassistant/components/lutron/switch.py
index 7aa5334cbf2..604f19fc2ae 100644
--- a/homeassistant/components/lutron/switch.py
+++ b/homeassistant/components/lutron/switch.py
@@ -23,7 +23,7 @@ class LutronSwitch(LutronDevice, SwitchDevice):
 
     def __init__(self, area_name, lutron_device, controller):
         """Initialize the switch."""
-        self._is_on = False
+        self._prev_state = None
         super().__init__(area_name, lutron_device, controller)
 
     def turn_on(self, **kwargs):
@@ -48,4 +48,5 @@ class LutronSwitch(LutronDevice, SwitchDevice):
 
     def update(self):
         """Call when forcing a refresh of the device."""
-        self._is_on = self._lutron_device.level > 0
+        if self._prev_state is None:
+            self._prev_state = self._lutron_device.level > 0