diff --git a/src/services/OpenAPIParser.ts b/src/services/OpenAPIParser.ts
index 61a755d5..e5c079e0 100644
--- a/src/services/OpenAPIParser.ts
+++ b/src/services/OpenAPIParser.ts
@@ -177,7 +177,7 @@ export class OpenAPIParser {
 
     schema = this.hoistOneOfs(schema, refsStack);
 
-    if (schema.allOf === undefined) {
+    if (schema.allOf === null || schema.allOf === undefined) {
       return schema;
     }
 
@@ -358,7 +358,7 @@ export class OpenAPIParser {
   }
 
   private hoistOneOfs(schema: OpenAPISchema, refsStack: string[]) {
-    if (schema.allOf === undefined) {
+    if (schema.allOf === null || schema.allOf === undefined) {
       return schema;
     }