diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 183dddf2c52..fed812138d6 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -253,7 +253,7 @@ class Cloud:
 
         info = await self.hass.async_add_job(load_config)
 
-        await self.prefs.async_initialize(not info)
+        await self.prefs.async_initialize(bool(info))
 
         if info is None:
             return
diff --git a/homeassistant/components/cloud/prefs.py b/homeassistant/components/cloud/prefs.py
index b2ed83fc6b2..c4aa43c91d2 100644
--- a/homeassistant/components/cloud/prefs.py
+++ b/homeassistant/components/cloud/prefs.py
@@ -28,6 +28,7 @@ class CloudPreferences:
                 PREF_GOOGLE_ALLOW_UNLOCK: False,
                 PREF_CLOUDHOOKS: {}
             }
+            await self._store.async_save(prefs)
 
         self._prefs = prefs