diff --git a/openleadr/client.py b/openleadr/client.py
index ecf4eb8..ee77f9b 100755
--- a/openleadr/client.py
+++ b/openleadr/client.py
@@ -1251,12 +1251,11 @@ async def _event_cleanup(self):
         """
         Periodic task that will clean up completed and cancelled events in our memory.
         """
-        for i in range(len(self.received_events)-1, -1, -1):
-            event = self.received_events[i]
+        for event in self.received_events:
             if event['event_descriptor']['event_status'] == 'cancelled' or \
                     utils.determine_event_status(event['active_period']) == 'completed':
                 logger.info(f"Removing event {event} because it is no longer relevant.")
-                self.received_events.pop(i)
+                self.received_events.pop(self.received_events.index(event))
 
     async def _poll(self):
         logger.debug("Now polling for new messages")