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 94eb3273c049..f4a9b336b305 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
@@ -3736,7 +3736,9 @@ protected void addProperties(Map<String, Schema> properties, List<String> requir
 
             if (schema.getAllOf() != null) {
                 for (Object component : schema.getAllOf()) {
-                    addProperties(properties, required, (Schema) component, visitedSchemas);
+                  if(!supportsInheritance){
+                       addProperties(properties, required, (Schema) component, visitedSchemas);
+                  }
                 }
             }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index 43767dc58d00..1f5a117c0e35 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -1087,6 +1087,9 @@ public CodegenModel fromModel(String name, Schema model) {
                 codegenModel.imports.add("Schema");
             }
         }
+        if(codegenModel.oneOf!= null && !codegenModel.oneOf.isEmpty() && codegenModel.discriminator!=null) {
+            codegenModel.oneOf = null;
+        }
 
         if (!AnnotationLibrary.SWAGGER2.equals(getAnnotationLibrary())) {
             codegenModel.imports.remove("Schema");