diff --git a/custom_components/mega/hub.py b/custom_components/mega/hub.py
index 0f62a7d..5ac7247 100644
--- a/custom_components/mega/hub.py
+++ b/custom_components/mega/hub.py
@@ -177,7 +177,8 @@ class MegaD:
                 qos=2,
                 retain=False,
             )
-            await asyncio.wait_for(self.cnd.wait_for(lambda: self.last_port == port), timeout=15)
+            await asyncio.wait_for(self.cnd.wait(), timeout=15)
+            await asyncio.sleep(0.05)
 
     async def get_all_ports(self):
         for x in range(37):