diff --git a/homeassistant/components/overkiz/config_flow.py b/homeassistant/components/overkiz/config_flow.py
index 599d112528a..479e212e317 100644
--- a/homeassistant/components/overkiz/config_flow.py
+++ b/homeassistant/components/overkiz/config_flow.py
@@ -49,15 +49,16 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         server = SUPPORTED_SERVERS[user_input[CONF_HUB]]
         session = async_create_clientsession(self.hass)
 
-        async with OverkizClient(
+        client = OverkizClient(
             username=username, password=password, server=server, session=session
-        ) as client:
-            await client.login(register_event_listener=False)
+        )
 
-            # Set first gateway id as unique id
-            if gateways := await client.get_gateways():
-                gateway_id = gateways[0].id
-                await self.async_set_unique_id(gateway_id)
+        await client.login(register_event_listener=False)
+
+        # Set first gateway id as unique id
+        if gateways := await client.get_gateways():
+            gateway_id = gateways[0].id
+            await self.async_set_unique_id(gateway_id)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -139,8 +140,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self, discovery_info: zeroconf.ZeroconfServiceInfo
     ) -> FlowResult:
         """Handle ZeroConf discovery."""
-
-        # abort if we already have exactly this bridge id/host
         properties = discovery_info.properties
         gateway_id = properties["gateway_pin"]