diff --git a/homeassistant/components/cloud/client.py b/homeassistant/components/cloud/client.py
index ad34186b7df..c47544f9d99 100644
--- a/homeassistant/components/cloud/client.py
+++ b/homeassistant/components/cloud/client.py
@@ -118,14 +118,15 @@ class CloudClient(Interface):
 
                 cloud_user = await self._prefs.get_cloud_user()
 
-                self._google_config = google_config.CloudGoogleConfig(
+                google_conf = google_config.CloudGoogleConfig(
                     self._hass,
                     self.google_user_config,
                     cloud_user,
                     self._prefs,
                     self.cloud,
                 )
-                await self._google_config.async_initialize()
+                await google_conf.async_initialize()
+                self._google_config = google_conf
 
         return self._google_config