diff --git a/hbmqtt/client.py b/hbmqtt/client.py
index da34962..42879b0 100644
--- a/hbmqtt/client.py
+++ b/hbmqtt/client.py
@@ -104,7 +104,7 @@ class MQTTClient:
         self.session = None
         self._handler = None
         self._disconnect_task = None
-        self._connected_state = asyncio.Event()
+        self._connected_state = asyncio.Event(loop=self._loop)
 
         # Init plugins manager
         context = ClientContext()
diff --git a/hbmqtt/mqtt/protocol/handler.py b/hbmqtt/mqtt/protocol/handler.py
index 5004592..8eeb90b 100644
--- a/hbmqtt/mqtt/protocol/handler.py
+++ b/hbmqtt/mqtt/protocol/handler.py
@@ -153,7 +153,7 @@ class ProtocolHandler:
         for message in itertools.chain(self.session.inflight_in.values(), self.session.inflight_out.values()):
             tasks.append(asyncio.wait_for(self._handle_message_flow(message), 10, loop=self._loop))
         if tasks:
-            done, pending = yield from asyncio.wait(tasks)
+            done, pending = yield from asyncio.wait(tasks, loop=self._loop)
             self.logger.debug("%d messages redelivered" % len(done))
             self.logger.debug("%d messages not redelivered due to timeout" % len(pending))
         self.logger.debug("End messages delivery retries")