diff --git a/ui/app/templates/partials/secret-form-create.hbs b/ui/app/templates/partials/secret-form-create.hbs
index 4f427b823b1b..3470343406df 100644
--- a/ui/app/templates/partials/secret-form-create.hbs
+++ b/ui/app/templates/partials/secret-form-create.hbs
@@ -1,7 +1,7 @@
 <form class="{{if showAdvancedMode 'advanced-edit' 'simple-edit'}}" onsubmit={{action "createOrUpdateKey" "create"}}>
   <div class="field box is-fullwidth is-sideless is-marginless">
     <NamespaceReminder @mode="create" @noun="secret" />
-    <MessageError @model={{model}} @errorMessage={{error}} />
+    <MessageError @model={{modelForData}} @errorMessage={{error}} />
     <label class="is-label" for="kv-key">Path for this secret</label>
     <p class="control is-expanded">
       {{input 
diff --git a/ui/app/templates/partials/secret-form-edit.hbs b/ui/app/templates/partials/secret-form-edit.hbs
index c2958e0402de..af6f9b55780b 100644
--- a/ui/app/templates/partials/secret-form-edit.hbs
+++ b/ui/app/templates/partials/secret-form-edit.hbs
@@ -1,6 +1,6 @@
 <form onsubmit={{action "createOrUpdateKey" "update"}}>
   <div class="box is-sideless is-fullwidth is-marginless is-paddingless">
-    <MessageError @model={{model}} @errorMessage={{error}} />
+    <MessageError @model={{modelForData}} @errorMessage={{error}} />
     <NamespaceReminder @mode="edit" @noun="secret" />
     {{#if (and (not model.failedServerRead) (not model.selectedVersion.failedServerRead) (not-eq model.selectedVersion.version model.currentVersion))}}
       <div class="form-section">