diff --git a/src/services/OpenAPIParser.ts b/src/services/OpenAPIParser.ts
index 489769ee..b0d3a8f4 100644
--- a/src/services/OpenAPIParser.ts
+++ b/src/services/OpenAPIParser.ts
@@ -261,10 +261,12 @@ export class OpenAPIParser {
             receiver.properties[prop] = subSchema.properties[prop];
           } else {
             // merge inner properties
-            receiver.properties[prop] = this.mergeAllOf(
+            const mergedProp = this.mergeAllOf(
               { allOf: [receiver.properties[prop], subSchema.properties[prop]] },
               $ref + '/properties/' + prop,
             );
+            receiver.properties[prop] = mergedProp
+            this.exitParents(mergedProp); // every prop resolution should have separate recursive stack
           }
         }
       }