diff --git a/src/data/assist_pipeline.ts b/src/data/assist_pipeline.ts
index 517990f8ba..c9c214760e 100644
--- a/src/data/assist_pipeline.ts
+++ b/src/data/assist_pipeline.ts
@@ -5,10 +5,10 @@ import type { SpeechMetadata } from "./stt";
 
 export interface AssistPipeline {
   id: string;
+  name: string;
+  language: string;
   conversation_engine: string;
   conversation_language: string | null;
-  language: string;
-  name: string;
   stt_engine: string | null;
   stt_language: string | null;
   tts_engine: string | null;
@@ -17,15 +17,15 @@ export interface AssistPipeline {
 }
 
 export interface AssistPipelineMutableParams {
-  conversation_engine: string;
-  conversation_language?: string | null;
-  language: string;
   name: string;
-  stt_engine?: string | null;
-  stt_language?: string | null;
-  tts_engine?: string | null;
-  tts_language?: string | null;
-  tts_voice?: string | null;
+  language: string;
+  conversation_engine: string;
+  conversation_language: string | null;
+  stt_engine: string | null;
+  stt_language: string | null;
+  tts_engine: string | null;
+  tts_language: string | null;
+  tts_voice: string | null;
 }
 
 export interface assistRunListing {
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts
index 2779bc37e4..68011ef5c9 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-config.ts
@@ -11,8 +11,6 @@ export class AssistPipelineDetailConfig extends LitElement {
 
   @property() public data?: Partial<AssistPipeline>;
 
-  @property() public error?: Record<string, string>;
-
   @property() public supportedLanguages?: string[];
 
   private _schema = memoizeOne(
@@ -60,7 +58,6 @@ export class AssistPipelineDetailConfig extends LitElement {
         <ha-form
           .schema=${this._schema(this.supportedLanguages)}
           .data=${this.data}
-          .error=${this.error}
           .hass=${this.hass}
           .computeLabel=${this._computeLabel}
         ></ha-form>
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts
index 6923ce4c47..902bdf1eac 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-conversation.ts
@@ -11,8 +11,6 @@ export class AssistPipelineDetailConversation extends LitElement {
 
   @property() public data?: Partial<AssistPipeline>;
 
-  @property() public error?: Record<string, string>;
-
   private _schema = memoizeOne(
     (language?: string) =>
       [
@@ -60,7 +58,6 @@ export class AssistPipelineDetailConversation extends LitElement {
         <ha-form
           .schema=${this._schema(this.data?.language)}
           .data=${this.data}
-          .error=${this.error}
           .hass=${this.hass}
           .computeLabel=${this._computeLabel}
         ></ha-form>
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts
index dc8a019a63..cde84b698f 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-stt.ts
@@ -11,8 +11,6 @@ export class AssistPipelineDetailSTT extends LitElement {
 
   @property() public data?: Partial<AssistPipeline>;
 
-  @property() public error?: Record<string, string>;
-
   private _schema = memoizeOne(
     (language?: string) =>
       [
@@ -59,7 +57,6 @@ export class AssistPipelineDetailSTT extends LitElement {
         <ha-form
           .schema=${this._schema(this.data?.language)}
           .data=${this.data}
-          .error=${this.error}
           .hass=${this.hass}
           .computeLabel=${this._computeLabel}
         ></ha-form>
diff --git a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts
index c8eb59b601..09bd3c0296 100644
--- a/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts
+++ b/src/panels/config/voice-assistants/assist-pipeline-detail/assist-pipeline-detail-tts.ts
@@ -11,8 +11,6 @@ export class AssistPipelineDetailTTS extends LitElement {
 
   @property() public data?: Partial<AssistPipeline>;
 
-  @property() public error?: Record<string, string>;
-
   private _schema = memoizeOne(
     (language?: string) =>
       [
@@ -67,7 +65,6 @@ export class AssistPipelineDetailTTS extends LitElement {
         <ha-form
           .schema=${this._schema(this.data?.language)}
           .data=${this.data}
-          .error=${this.error}
           .hass=${this.hass}
           .computeLabel=${this._computeLabel}
         ></ha-form>
diff --git a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
index b1948be042..6e6878e31d 100644
--- a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
+++ b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
@@ -80,30 +80,29 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
               )
         )}
       >
-        <div>
+        <div class="content">
+          ${this._error
+            ? html`<ha-alert alert-type="error"> ${this._error} </ha-alert>`
+            : nothing}
           <assist-pipeline-detail-config
             .hass=${this.hass}
             .data=${this._data}
-            .error=${this._error}
             .supportedLanguages=${this._supportedLanguages}
             @value-changed=${this._valueChanged}
           ></assist-pipeline-detail-config>
           <assist-pipeline-detail-conversation
             .hass=${this.hass}
             .data=${this._data}
-            .error=${this._error}
             @value-changed=${this._valueChanged}
           ></assist-pipeline-detail-conversation>
           <assist-pipeline-detail-stt
             .hass=${this.hass}
             .data=${this._data}
-            .error=${this._error}
             @value-changed=${this._valueChanged}
           ></assist-pipeline-detail-stt>
           <assist-pipeline-detail-tts
             .hass=${this.hass}
             .data=${this._data}
-            .error=${this._error}
             @value-changed=${this._valueChanged}
           ></assist-pipeline-detail-tts>
         </div>
@@ -165,12 +164,12 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
           name: data.name!,
           language: data.language!,
           conversation_engine: data.conversation_engine!,
-          conversation_language: data.conversation_language,
-          stt_engine: data.stt_engine,
-          stt_language: data.stt_language,
-          tts_engine: data.tts_engine,
-          tts_language: data.tts_language,
-          tts_voice: data.tts_voice,
+          conversation_language: data.conversation_language ?? null,
+          stt_engine: data.stt_engine ?? null,
+          stt_language: data.stt_language ?? null,
+          tts_engine: data.tts_engine ?? null,
+          tts_language: data.tts_language ?? null,
+          tts_voice: data.tts_voice ?? null,
         };
         await this._params!.updatePipeline(values);
       } else {
@@ -180,7 +179,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
       }
       this.closeDialog();
     } catch (err: any) {
-      this._error = { base: err?.message || "Unknown error" };
+      this._error = err?.message || "Unknown error";
     } finally {
       this._submitting = false;
     }
@@ -192,7 +191,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
       await this._params!.setPipelinePreferred();
       this._preferred = true;
     } catch (err: any) {
-      this._error = { base: err?.message || "Unknown error" };
+      this._error = err?.message || "Unknown error";
     } finally {
       this._submitting = false;
     }
@@ -205,7 +204,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
         this.closeDialog();
       }
     } catch (err: any) {
-      this._error = { base: err?.message || "Unknown error" };
+      this._error = err?.message || "Unknown error";
     } finally {
       this._submitting = false;
     }
@@ -217,11 +216,14 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
       css`
         assist-pipeline-detail-config,
         assist-pipeline-detail-conversation,
-        assist-pipeline-detail-stt,
-        assist-pipeline-detail-tts {
+        assist-pipeline-detail-stt {
           margin-bottom: 16px;
           display: block;
         }
+        ha-alert {
+          margin-bottom: 8px;
+          display: block;
+        }
       `,
     ];
   }