diff --git a/custom_components/mega/binary_sensor.py b/custom_components/mega/binary_sensor.py
index dd630f7..7cd3687 100644
--- a/custom_components/mega/binary_sensor.py
+++ b/custom_components/mega/binary_sensor.py
@@ -69,7 +69,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 
         async_add_devices(devices)
 
-    hass.async_create_task(scan())
+    await scan()
 
 class MegaBinarySensor(BinarySensorEntity, BaseMegaEntity):
 
diff --git a/custom_components/mega/light.py b/custom_components/mega/light.py
index 77e94c0..f9ffc57 100644
--- a/custom_components/mega/light.py
+++ b/custom_components/mega/light.py
@@ -85,7 +85,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
                 devices.append(light)
         async_add_devices(devices)
 
-    hass.async_create_task(scan_ports())
+    await scan_ports()
 
 
 class MegaLight(LightEntity, BaseMegaEntity):
diff --git a/custom_components/mega/sensor.py b/custom_components/mega/sensor.py
index 62a1ba6..3528149 100644
--- a/custom_components/mega/sensor.py
+++ b/custom_components/mega/sensor.py
@@ -111,7 +111,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 
         async_add_devices(devices)
 
-    hass.async_create_task(scan())
+    await scan()
 
 
 class Mega1WSensor(BaseMegaEntity):