diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 4d7eb4dbe7c1..72cfbf08a1de 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -622,6 +622,7 @@ public ModelsMap postProcessModels(ModelsMap objs) {
         if (useOptional) {
             for (ModelMap modelMap : objs.getModels()) {
                 CodegenModel model = modelMap.getModel();
+                boolean hasOptionalProperties = false;
 
                 boolean shouldUseOptional;
 
@@ -636,9 +637,12 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                     for (CodegenProperty prop : model.vars) {
                         if (!prop.required && !prop.dataType.startsWith("Optional<")) {
                             wrapPropertyWithOptional(prop);
+                            hasOptionalProperties = true;
                         }
                     }
                 }
+
+                model.vendorExtensions.put("x-has-optional-properties", hasOptionalProperties);
             }
         }
 
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/lib.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/lib.mustache
index 880bb6258354..581624c15a8b 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/lib.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/lib.mustache
@@ -4,6 +4,8 @@ export 'package:{{pubName}}/{{sourceFolder}}/auth/api_key_auth.dart';
 export 'package:{{pubName}}/{{sourceFolder}}/auth/basic_auth.dart';
 export 'package:{{pubName}}/{{sourceFolder}}/auth/bearer_auth.dart';
 export 'package:{{pubName}}/{{sourceFolder}}/auth/oauth.dart';
+{{#useOptional}}export 'package:{{pubName}}/{{sourceFolder}}/optional.dart';
+{{/useOptional}}
 {{#useBuiltValue}}export 'package:{{pubName}}/{{sourceFolder}}/serializers.dart';
 {{#useDateLibCore}}export 'package:{{pubName}}/{{sourceFolder}}/{{modelPackage}}/date.dart';{{/useDateLibCore}}{{/useBuiltValue}}
 
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
index 7a9ee688596b..b7ce07ace304 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
@@ -2,6 +2,8 @@ import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';{{#oneOf}}{{#-first}}
 import 'package:one_of/one_of.dart';{{/-first}}{{/oneOf}}{{#anyOf}}{{#-first}}
 import 'package:one_of/any_of.dart';{{/-first}}{{/anyOf}}
+{{#vendorExtensions.x-has-optional-properties}}import 'package:{{pubName}}/{{sourceFolder}}/optional.dart';
+{{/vendorExtensions.x-has-optional-properties}}
 
 {{#imports}}
 {{/imports}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_members.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_members.mustache
index 50b7f98ba60d..f8cbd467ab05 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_members.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_members.mustache
@@ -31,8 +31,9 @@
   factory {{classname}}([void updates({{classname}}Builder b)]) = _${{classname}};
 
   @BuiltValueHook(initializeBuilder: true)
-  static void _defaults({{{classname}}}Builder b) => b{{#vendorExtensions.x-parent-discriminator}}..{{propertyName}}=b.discriminatorValue{{/vendorExtensions.x-parent-discriminator}}{{#vendorExtensions.x-self-and-ancestor-only-props}}{{#defaultValue}}
-      ..{{{name}}} = {{#isEnum}}{{^isContainer}}{{#enumName}}{{enumName}}.valueOf({{{defaultValue}}}){{/enumName}}{{^enumName}}{{{defaultValue}}}{{/enumName}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/defaultValue}}{{/vendorExtensions.x-self-and-ancestor-only-props}};
+  static void _defaults({{{classname}}}Builder b) => b{{#vendorExtensions.x-parent-discriminator}}..{{propertyName}}=b.discriminatorValue{{/vendorExtensions.x-parent-discriminator}}{{#vendorExtensions.x-self-and-ancestor-only-props}}{{#vendorExtensions.x-is-optional}}
+      ..{{{name}}} = Optional.absent(){{/vendorExtensions.x-is-optional}}{{^vendorExtensions.x-is-optional}}{{#defaultValue}}
+      ..{{{name}}} = {{#isEnum}}{{^isContainer}}{{#enumName}}{{enumName}}.valueOf({{{defaultValue}}}){{/enumName}}{{^enumName}}{{{defaultValue}}}{{/enumName}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/defaultValue}}{{/vendorExtensions.x-is-optional}}{{/vendorExtensions.x-self-and-ancestor-only-props}};
 
 {{/vendorExtensions.x-is-parent}}  @BuiltValueSerializer(custom: true)
   static Serializer<{{classname}}> get serializer => _${{classname}}Serializer();
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache
index 4cd02f3506de..ef0a6301bfa3 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache
@@ -11,6 +11,21 @@ class _${{classname}}Serializer implements PrimitiveSerializer<{{classname}}> {
     FullType specifiedType = FullType.unspecified,
   }) sync* {
     {{#vendorExtensions.x-self-and-ancestor-only-props}}
+    {{#vendorExtensions.x-is-optional}}
+    if (object.{{{name}}}.isPresent) {
+      yield r'{{baseName}}';
+      final optionalValue = object.{{{name}}}.value;
+      if (optionalValue == null) {
+        yield null;
+      } else {
+        yield serializers.serialize(
+          optionalValue,
+          specifiedType: const {{>serialization/built_value/variable_serializer_type}},
+        );
+      }
+    }
+    {{/vendorExtensions.x-is-optional}}
+    {{^vendorExtensions.x-is-optional}}
     {{#required}}
     {{!
         A required property need to always be part of the serialized output.
@@ -32,6 +47,7 @@ class _${{classname}}Serializer implements PrimitiveSerializer<{{classname}}> {
       );
     }
     {{/required}}
+    {{/vendorExtensions.x-is-optional}}
     {{/vendorExtensions.x-self-and-ancestor-only-props}}
   }
 
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/variable_serializer_type.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/variable_serializer_type.mustache
index c76dde39a9c9..8116fcb4ede8 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/variable_serializer_type.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/variable_serializer_type.mustache
@@ -1 +1 @@
-FullType{{#isNullable}}.nullable{{/isNullable}}({{#isContainer}}{{baseType}}, [{{#isMap}}FullType(String), {{/isMap}}{{#items}}{{>serialization/built_value/variable_serializer_type}}{{/items}}]{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}})
\ No newline at end of file
+{{#vendorExtensions.x-is-optional}}{{#isContainer}}FullType{{#isNullable}}.nullable{{/isNullable}}({{baseType}}, [{{#isMap}}FullType(String), {{/isMap}}{{#items}}{{>serialization/built_value/variable_serializer_type}}{{/items}}]){{/isContainer}}{{^isContainer}}FullType.nullable({{{vendorExtensions.x-unwrapped-datatype}}}){{/isContainer}}{{/vendorExtensions.x-is-optional}}{{^vendorExtensions.x-is-optional}}FullType{{#isNullable}}.nullable{{/isNullable}}({{#isContainer}}{{baseType}}, [{{#isMap}}FullType(String), {{/isMap}}{{#items}}{{>serialization/built_value/variable_serializer_type}}{{/items}}]{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}){{/vendorExtensions.x-is-optional}}
\ No newline at end of file