diff --git a/src/bluecurrent_api/websocket.py b/src/bluecurrent_api/websocket.py
index e72be93..37eb28b 100644
--- a/src/bluecurrent_api/websocket.py
+++ b/src/bluecurrent_api/websocket.py
@@ -165,7 +165,6 @@ async def _message_handler(
             return
 
         if object_name == "CHARGE_POINTS":
-            self.received_charge_points.set()
             handle_charge_points(message)
         elif object_name == "CH_STATUS":
             handle_status(message)
@@ -187,6 +186,9 @@ async def _message_handler(
 
         await receiver(message)
 
+        if object_name == "CHARGE_POINTS":
+            self.received_charge_points.set()
+
     async def _send(self, data: dict[str, Any]) -> None:
         """Send data to the websocket."""
         if self.conn: