diff --git a/src/panels/config/cloud/login/cloud-login.ts b/src/panels/config/cloud/login/cloud-login.ts
index 2190b8a388..aed24cb08b 100644
--- a/src/panels/config/cloud/login/cloud-login.ts
+++ b/src/panels/config/cloud/login/cloud-login.ts
@@ -233,7 +233,6 @@ export class CloudLogin extends LitElement {
     const doLogin = async (username: string) => {
       try {
         const result = await cloudLogin(this.hass, username, password);
-        fireEvent(this, "ha-refresh-cloud-status");
         this.email = "";
         this._password = "";
         if (result.cloud_pipeline) {
@@ -250,6 +249,7 @@ export class CloudLogin extends LitElement {
             setAssistPipelinePreferred(this.hass, result.cloud_pipeline);
           }
         }
+        fireEvent(this, "ha-refresh-cloud-status");
       } catch (err: any) {
         const errCode = err && err.body && err.body.code;
         if (errCode === "PasswordChangeRequired") {