diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index dfad68de1c9..f2eb1c3a73e 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -276,11 +276,7 @@ export default class DEditor extends Component.extend(
   @discourseComputed("formTemplateIds", "replyingToTopic", "editingPost")
   showFormTemplateForm(formTemplateIds, replyingToTopic, editingPost) {
     // TODO(@keegan): Remove !editingPost once we add edit/draft support for form templates
-    if (formTemplateIds?.length > 0 && !replyingToTopic && !editingPost) {
-      return true;
-    }
-
-    return false;
+    return formTemplateIds?.length > 0 && !replyingToTopic && !editingPost;
   }
 
   @discourseComputed("placeholder")
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.gjs b/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.gjs
index 27c3b8aa309..d5df251fba6 100644
--- a/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.gjs
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.gjs
@@ -87,7 +87,7 @@ export default class FormTemplateFieldWrapper extends Component {
           />
         {{/each}}
       </div>
-    {{else}}
+    {{else if this.error}}
       <div class="alert alert-error">
         {{this.error}}
       </div>