diff --git a/ocpp/charge_point.py b/ocpp/charge_point.py
index e5f891743..ae16ab7d2 100644
--- a/ocpp/charge_point.py
+++ b/ocpp/charge_point.py
@@ -121,7 +121,7 @@ def __init__(self, id, connection, response_timeout=30):
         self._unique_id_generator = uuid.uuid4
 
     async def start(self):
-        while True:
+        while self._connection is not None:
             message = await self._connection.recv()
             LOGGER.info('%s: receive message %s', self.id, message)