diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
index be2f7cb8714..3966021d176 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
@@ -198,13 +198,11 @@ class DeclarationStubGenerator(
         }
 
         if (createPropertyIfNeeded && descriptor is PropertyGetterDescriptor) {
-            val propertySymbol = symbolTable.referenceProperty(descriptor.correspondingProperty)
-            val property = irProviders_.getDeclaration(propertySymbol) as IrProperty
+            val property = generatePropertyStub(descriptor.correspondingProperty)
             return property.getter!!
         }
         if (createPropertyIfNeeded && descriptor is PropertySetterDescriptor) {
-            val propertySymbol = symbolTable.referenceProperty(descriptor.correspondingProperty)
-            val property = irProviders_.getDeclaration(propertySymbol) as IrProperty
+            val property = generatePropertyStub(descriptor.correspondingProperty)
             return property.setter!!
         }