diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 2002667a31ce..93325b2bad63 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -3002,7 +3002,9 @@ protected void updateModelForNumber(CodegenModel model, Schema schema) {
         model.isNumeric = Boolean.TRUE;
         if (ModelUtils.isFloatSchema(schema)) { // float
             model.isFloat = Boolean.TRUE;
-        } else if (ModelUtils.isDoubleSchema(schema)) { // double
+        } else {
+            // Set isDouble for explicit "format: double" OR when no format is specified
+            // (since "type: number" without format defaults to Double in most languages)
             model.isDouble = Boolean.TRUE;
         }
     }
@@ -3886,7 +3888,9 @@ protected void updatePropertyForNumber(CodegenProperty property, Schema p) {
         property.isNumeric = Boolean.TRUE;
         if (ModelUtils.isFloatSchema(p)) { // float
             property.isFloat = Boolean.TRUE;
-        } else if (ModelUtils.isDoubleSchema(p)) { // double
+        } else {
+            // Set isDouble for explicit "format: double" OR when no format is specified
+            // (since "type: number" without format defaults to Double in most languages)
             property.isDouble = Boolean.TRUE;
         }
     }