diff --git a/src/dialogs/config-flow/step-flow-create-entry.ts b/src/dialogs/config-flow/step-flow-create-entry.ts
index 1615a6c451..06eab5c85b 100644
--- a/src/dialogs/config-flow/step-flow-create-entry.ts
+++ b/src/dialogs/config-flow/step-flow-create-entry.ts
@@ -65,7 +65,8 @@ class StepFlowCreateEntry extends LitElement {
 
     if (
       devices.length !== 1 ||
-      devices[0].primary_config_entry !== this.step.result?.entry_id
+      devices[0].primary_config_entry !== this.step.result?.entry_id ||
+      this.step.result.domain === "voip"
     ) {
       return;
     }
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
index eadf4a901a..81ed1c1113 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
@@ -47,6 +47,8 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
 
   @state() private _assistConfiguration?: AssistSatelliteConfiguration;
 
+  @state() private _error?: string;
+
   private _previousSteps: STEP[] = [];
 
   private _nextStep?: STEP;
@@ -165,79 +167,86 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
                   "update"
                 )}
               ></ha-voice-assistant-setup-step-update>`
-            : assistEntityState?.state === UNAVAILABLE
-              ? this.hass.localize(
-                  "ui.panel.config.voice_assistants.satellite_wizard.not_available"
-                )
-              : this._step === STEP.CHECK
-                ? html`<ha-voice-assistant-setup-step-check
-                    .hass=${this.hass}
-                    .assistEntityId=${assistSatelliteEntityId}
-                  ></ha-voice-assistant-setup-step-check>`
-                : this._step === STEP.WAKEWORD
-                  ? html`<ha-voice-assistant-setup-step-wake-word
+            : this._error
+              ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+              : assistEntityState?.state === UNAVAILABLE
+                ? html`<ha-alert alert-type="error"
+                    >${this.hass.localize(
+                      "ui.panel.config.voice_assistants.satellite_wizard.not_available"
+                    )}</ha-alert
+                  >`
+                : this._step === STEP.CHECK
+                  ? html`<ha-voice-assistant-setup-step-check
                       .hass=${this.hass}
-                      .assistConfiguration=${this._assistConfiguration}
                       .assistEntityId=${assistSatelliteEntityId}
-                      .deviceEntities=${this._deviceEntities(
-                        this._params.deviceId,
-                        this.hass.entities
-                      )}
-                    ></ha-voice-assistant-setup-step-wake-word>`
-                  : this._step === STEP.CHANGE_WAKEWORD
-                    ? html`
-                        <ha-voice-assistant-setup-step-change-wake-word
-                          .hass=${this.hass}
-                          .assistConfiguration=${this._assistConfiguration}
-                          .assistEntityId=${assistSatelliteEntityId}
-                        ></ha-voice-assistant-setup-step-change-wake-word>
-                      `
-                    : this._step === STEP.AREA
+                    ></ha-voice-assistant-setup-step-check>`
+                  : this._step === STEP.WAKEWORD
+                    ? html`<ha-voice-assistant-setup-step-wake-word
+                        .hass=${this.hass}
+                        .assistConfiguration=${this._assistConfiguration}
+                        .assistEntityId=${assistSatelliteEntityId}
+                        .deviceEntities=${this._deviceEntities(
+                          this._params.deviceId,
+                          this.hass.entities
+                        )}
+                      ></ha-voice-assistant-setup-step-wake-word>`
+                    : this._step === STEP.CHANGE_WAKEWORD
                       ? html`
-                          <ha-voice-assistant-setup-step-area
-                            .hass=${this.hass}
-                            .deviceId=${this._params.deviceId}
-                          ></ha-voice-assistant-setup-step-area>
-                        `
-                      : this._step === STEP.PIPELINE
-                        ? html`<ha-voice-assistant-setup-step-pipeline
+                          <ha-voice-assistant-setup-step-change-wake-word
                             .hass=${this.hass}
                             .assistConfiguration=${this._assistConfiguration}
                             .assistEntityId=${assistSatelliteEntityId}
-                          ></ha-voice-assistant-setup-step-pipeline>`
-                        : this._step === STEP.CLOUD
-                          ? html`<ha-voice-assistant-setup-step-cloud
+                          ></ha-voice-assistant-setup-step-change-wake-word>
+                        `
+                      : this._step === STEP.AREA
+                        ? html`
+                            <ha-voice-assistant-setup-step-area
                               .hass=${this.hass}
-                            ></ha-voice-assistant-setup-step-cloud>`
-                          : this._step === STEP.LOCAL
-                            ? html`<ha-voice-assistant-setup-step-local
+                              .deviceId=${this._params.deviceId}
+                            ></ha-voice-assistant-setup-step-area>
+                          `
+                        : this._step === STEP.PIPELINE
+                          ? html`<ha-voice-assistant-setup-step-pipeline
+                              .hass=${this.hass}
+                              .assistConfiguration=${this._assistConfiguration}
+                              .assistEntityId=${assistSatelliteEntityId}
+                            ></ha-voice-assistant-setup-step-pipeline>`
+                          : this._step === STEP.CLOUD
+                            ? html`<ha-voice-assistant-setup-step-cloud
                                 .hass=${this.hass}
-                                .assistConfiguration=${this
-                                  ._assistConfiguration}
-                              ></ha-voice-assistant-setup-step-local>`
-                            : this._step === STEP.SUCCESS
-                              ? html`<ha-voice-assistant-setup-step-success
+                              ></ha-voice-assistant-setup-step-cloud>`
+                            : this._step === STEP.LOCAL
+                              ? html`<ha-voice-assistant-setup-step-local
                                   .hass=${this.hass}
                                   .assistConfiguration=${this
                                     ._assistConfiguration}
-                                  .assistEntityId=${assistSatelliteEntityId}
-                                ></ha-voice-assistant-setup-step-success>`
-                              : nothing}
+                                ></ha-voice-assistant-setup-step-local>`
+                              : this._step === STEP.SUCCESS
+                                ? html`<ha-voice-assistant-setup-step-success
+                                    .hass=${this.hass}
+                                    .assistConfiguration=${this
+                                      ._assistConfiguration}
+                                    .assistEntityId=${assistSatelliteEntityId}
+                                  ></ha-voice-assistant-setup-step-success>`
+                                : nothing}
         </div>
       </ha-dialog>
     `;
   }
 
   private async _fetchAssistConfiguration() {
-    this._assistConfiguration = await fetchAssistSatelliteConfiguration(
-      this.hass,
-      this._findDomainEntityId(
-        this._params!.deviceId,
-        this.hass.entities,
-        "assist_satellite"
-      )!
-    );
-    return this._assistConfiguration;
+    try {
+      this._assistConfiguration = await fetchAssistSatelliteConfiguration(
+        this.hass,
+        this._findDomainEntityId(
+          this._params!.deviceId,
+          this.hass.entities,
+          "assist_satellite"
+        )!
+      );
+    } catch (err: any) {
+      this._error = err.message;
+    }
   }
 
   private _goToPreviousStep() {
@@ -293,6 +302,10 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
         .skip-btn {
           margin-top: 6px;
         }
+        ha-alert {
+          margin: 24px;
+          display: block;
+        }
       `,
     ];
   }
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
index d6416e312d..e9db911f49 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
@@ -85,7 +85,7 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
         <div class="rows">
           ${this.assistConfiguration &&
           this.assistConfiguration.available_wake_words.length > 1
-            ? html` <div class="row">
+            ? html`<div class="row">
                 <ha-select
                   .label=${"Wake word"}
                   @closed=${stopPropagation}
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts
index fb0d8abc3b..6d658bf511 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts
@@ -44,6 +44,15 @@ export class HaVoiceAssistantSetupStepWakeWord extends LitElement {
   protected override willUpdate(changedProperties: PropertyValues) {
     super.willUpdate(changedProperties);
 
+    if (changedProperties.has("assistConfiguration")) {
+      if (
+        this.assistConfiguration &&
+        !this.assistConfiguration.available_wake_words.length
+      ) {
+        this._nextStep();
+      }
+    }
+
     if (changedProperties.has("assistEntityId")) {
       this._detected = false;
       this._muteSwitchEntity = this.deviceEntities?.find(
@@ -135,13 +144,16 @@ export class HaVoiceAssistantSetupStepWakeWord extends LitElement {
               >`
             : nothing}
       </div>
-      <div class="footer centered">
-        <ha-button @click=${this._changeWakeWord}
-          >${this.hass.localize(
-            "ui.panel.config.voice_assistants.satellite_wizard.wake_word.change_wake_word"
-          )}</ha-button
-        >
-      </div>`;
+      ${this.assistConfiguration &&
+      this.assistConfiguration.available_wake_words.length > 1
+        ? html`<div class="footer centered">
+            <ha-button @click=${this._changeWakeWord}
+              >${this.hass.localize(
+                "ui.panel.config.voice_assistants.satellite_wizard.wake_word.change_wake_word"
+              )}</ha-button
+            >
+          </div>`
+        : nothing}`;
   }
 
   private async _listenWakeWord() {
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index ad7e23738f..84d72920e0 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -1073,7 +1073,14 @@ export class HaConfigDevicePage extends LitElement {
       (ent) => computeDomain(ent.entity_id) === "assist_satellite"
     );
 
+    const domains = this._integrations(
+      device,
+      this.entries,
+      this.manifests
+    ).map((int) => int.domain);
+
     if (
+      !domains.includes("voip") &&
       assistSatellite &&
       assistSatelliteSupportsSetupFlow(
         this.hass.states[assistSatellite.entity_id]
@@ -1088,12 +1095,6 @@ export class HaConfigDevicePage extends LitElement {
       });
     }
 
-    const domains = this._integrations(
-      device,
-      this.entries,
-      this.manifests
-    ).map((int) => int.domain);
-
     if (domains.includes("mqtt")) {
       const mqtt = await import(
         "./device-detail/integration-elements/mqtt/device-actions"