diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java
index 8b048c35e05..5b21a8ca5b2 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java
@@ -239,12 +239,18 @@ public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
         if (stub != null) {
             return stub.hasInitializer();
         }
+
         return getInitializer() != null;
     }
 
     @Override
     @Nullable
     public KtExpression getInitializer() {
+        KotlinPropertyStub stub = getStub();
+        if (stub != null && !stub.hasInitializer()) {
+            return null;
+        }
+
         return PsiTreeUtil.getNextSiblingOfType(findChildByType(EQ), KtExpression.class);
     }