diff --git a/libpurecool/dyson_360_eye.py b/libpurecool/dyson_360_eye.py
index ee09afd..3237a07 100644
--- a/libpurecool/dyson_360_eye.py
+++ b/libpurecool/dyson_360_eye.py
@@ -113,9 +113,9 @@ def on_message(client, userdata, msg):
         device_msg = None
         if Dyson360EyeState.is_state_message(payload):
             device_msg = Dyson360EyeState(payload)
+            userdata.state = device_msg
             if not userdata.device_available:
                 userdata.state_data_available()
-            userdata.state = device_msg
         elif Dyson360EyeMapGlobal.is_map_global(payload):
             device_msg = Dyson360EyeMapGlobal(payload)
         elif Dyson360EyeTelemetryData.is_telemetry_data(payload):
diff --git a/libpurecool/dyson_pure_cool_link.py b/libpurecool/dyson_pure_cool_link.py
index 735f6ac..c85415b 100644
--- a/libpurecool/dyson_pure_cool_link.py
+++ b/libpurecool/dyson_pure_cool_link.py
@@ -93,9 +93,9 @@ def on_message(client, userdata, msg):
                 device_msg = DysonPureCoolV2State(payload)
             else:
                 device_msg = DysonPureCoolState(payload)
+            userdata.state = device_msg
             if not userdata.device_available:
                 userdata.state_data_available()
-            userdata.state = device_msg
             for function in userdata.callback_message:
                 function(device_msg)
         elif DysonEnvironmentalSensorState.is_environmental_state_message(
@@ -104,9 +104,9 @@ def on_message(client, userdata, msg):
                 device_msg = DysonEnvironmentalSensorV2State(payload)
             else:
                 device_msg = DysonEnvironmentalSensorState(payload)
+            userdata.environmental_state = device_msg
             if not userdata.device_available:
                 userdata.sensor_data_available()
-            userdata.environmental_state = device_msg
             for function in userdata.callback_message:
                 function(device_msg)
         else: