diff --git a/custom_components/adaptive_cover/coordinator.py b/custom_components/adaptive_cover/coordinator.py
index 3d620f8..d890d33 100644
--- a/custom_components/adaptive_cover/coordinator.py
+++ b/custom_components/adaptive_cover/coordinator.py
@@ -159,6 +159,9 @@ async def async_check_cover_state_change(
         """Fetch and process state change event."""
         _LOGGER.debug("Cover state change")
         data = event.data
+        if data["old_state"] is None:
+            _LOGGER.debug("Old state is None")
+            return
         self.state_change_data = StateChangedData(
             data["entity_id"], data["old_state"], data["new_state"]
         )
@@ -319,6 +322,7 @@ async def async_set_manual_position(self, entity, position):
 
         self.wait_for_target[entity] = True
         self.target_call[entity] = position
+        _LOGGER.debug("Set wait for target %s and target call %s", self.wait_for_target, self.target_call)
         await self.hass.services.async_call(COVER_DOMAIN, service, service_data)
         _LOGGER.debug("Run %s with data %s", service, service_data)