diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 872d954d3fa7..4521ca49ea76 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -807,17 +807,11 @@ public String toDefaultValue(Schema schema) {
         if (ModelUtils.isArraySchema(schema)) {
             final String pattern;
             if (ModelUtils.isSet(schema)) {
-                if (fullJavaUtil) {
-                    pattern = "new java.util.LinkedHashSet<%s>()";
-                } else {
-                    pattern = "new LinkedHashSet<%s>()";
-                }
+                String mapInstantiationType = instantiationTypes().getOrDefault("set", "LinkedHashSet");
+                pattern = "new " + mapInstantiationType + "<%s>()";
             } else {
-                if (fullJavaUtil) {
-                    pattern = "new java.util.ArrayList<%s>()";
-                } else {
-                    pattern = "new ArrayList<%s>()";
-                }
+                String arrInstantiationType = instantiationTypes().getOrDefault("array", "ArrayList");
+                pattern = "new " + arrInstantiationType + "<%s>()";
             }
 
             Schema<?> items = getSchemaItems((ArraySchema) schema);
@@ -840,12 +834,10 @@ public String toDefaultValue(Schema schema) {
                 }
                 return null;
             }
-            final String pattern;
-            if (fullJavaUtil) {
-                pattern = "new java.util.HashMap<%s>()";
-            } else {
-                pattern = "new HashMap<%s>()";
-            }
+
+            String mapInstantiationType = instantiationTypes().getOrDefault("map", "HashMap");
+            final String pattern = "new " + mapInstantiationType + "<%s>()";
+
             if (getAdditionalProperties(schema) == null) {
                 return null;
             }