diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs
index 9d7f0ca5cd9..c3c2e2a0e2a 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/control-wrapper.gjs
@@ -96,6 +96,7 @@ export default class FKControlWrapper extends Component {
           @height={{@height}}
           @preview={{@preview}}
           @selection={{@selection}}
+          @includeNone={{@includeNone}}
           id={{@field.id}}
           name={{@field.name}}
           aria-invalid={{if this.error "true"}}
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/select.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/select.gjs
index 657ff2bee23..fc1292df744 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/select.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/select.gjs
@@ -21,7 +21,9 @@ export default class FKControlSelect extends Component {
       return true;
     }
 
-    return !this.args.field.validation?.includes("required");
+    return (
+      this.args.includeNone ?? !this.args.field.validation?.includes("required")
+    );
   }
 
   <template>
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/select-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/select-test.gjs
index 1cf57fe60c5..f778f787966 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/select-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/select-test.gjs
@@ -124,6 +124,22 @@ module(
           NO_VALUE_OPTION,
           "it has the none when no value is present and field is not required"
         );
+
+      await render(<template>
+        <Form @data={{hash foo="1"}} as |form|>
+          <form.Field @name="foo" @title="Foo" as |field|>
+            <field.Select @includeNone={{false}} />
+          </form.Field>
+        </Form>
+      </template>);
+
+      assert
+        .form()
+        .field("foo")
+        .hasNoValue(
+          NO_VALUE_OPTION,
+          "it doesn’t have the none for an optional field when value is present and includeNone is false"
+        );
     });
   }
 );