diff --git a/homeassistant/components/evohome/__init__.py b/homeassistant/components/evohome/__init__.py
index 2a9a44de717..2df4ae1be6b 100644
--- a/homeassistant/components/evohome/__init__.py
+++ b/homeassistant/components/evohome/__init__.py
@@ -141,9 +141,9 @@ class EvoSession:
             client_v2._user_account = None  # noqa: SLF001
 
         await client_v2.login()
-        await self.save_auth_tokens()
+        self.client_v2 = client_v2  # only set attr if authentication succeeded
 
-        self.client_v2 = client_v2
+        await self.save_auth_tokens()
 
         self.client_v1 = ev1.EvohomeClient(
             username,