diff --git a/custom_components/duofern/__init__.py b/custom_components/duofern/__init__.py
index a1eb001..6c93da4 100644
--- a/custom_components/duofern/__init__.py
+++ b/custom_components/duofern/__init__.py
@@ -80,9 +80,8 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         unsetupDevice(hass, duofernId)
 
     for component in DUOFERN_COMPONENTS:
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_unload(config_entry, component)
-        )
+        await hass.config_entries.async_forward_entry_unload(config_entry, component)
+
 
 
     newstick = DuofernStickThreaded(serial_port=stick.port, system_code=stick.system_code,
@@ -132,9 +131,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Setup the Duofern Config entries (entities, devices, etc...)"""
     for component in DUOFERN_COMPONENTS:
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(entry, component)
-        )
+        await hass.config_entries.async_forward_entry_setups(entry, component)
 
     return True
 
diff --git a/custom_components/duofern/manifest.json b/custom_components/duofern/manifest.json
index c085bd5..9e01bbd 100644
--- a/custom_components/duofern/manifest.json
+++ b/custom_components/duofern/manifest.json
@@ -7,5 +7,5 @@
   "issue_tracker": "https://github.com/gluap/pyduofern-hacs/issues" ,
   "codeowners": ["@gluap"],
   "requirements": ["pyduofern==0.36.2"],
-  "version": "0.5.16"
+  "version": "0.5.17"
 }