diff --git a/mautrix_amp/rpc/client.py b/mautrix_amp/rpc/client.py
index 11a8cfa..29a4335 100644
--- a/mautrix_amp/rpc/client.py
+++ b/mautrix_amp/rpc/client.py
@@ -81,7 +81,8 @@ class Client(RPCClient):
         try:
             while True:
                 await event.wait()
-                while item := data.popleft():
+                while len(data) > 0:
+                    item = data.popleft()
                     if item is None:
                         return
                     yield item