diff --git a/uast/uast-common/src/org/jetbrains/uast/baseElements/UComment.kt b/uast/uast-common/src/org/jetbrains/uast/baseElements/UComment.kt
index 450795da176e..fbe1f7b169c1 100644
--- a/uast/uast-common/src/org/jetbrains/uast/baseElements/UComment.kt
+++ b/uast/uast-common/src/org/jetbrains/uast/baseElements/UComment.kt
@@ -21,15 +21,18 @@ import org.jetbrains.uast.internal.log
 
 open class UComment(override val sourcePsi: PsiComment, private val givenParent: UElement?) : UElement {
 
+  private val uastParentPart = UastLazyPart<UElement?>()
+
   @Suppress("OverridingDeprecatedMember")
   @get:ApiStatus.ScheduledForRemoval
   @get:Deprecated("see the base property description")
   @Deprecated("see the base property description", ReplaceWith("sourcePsi"))
   override val psi: PsiComment get() = sourcePsi
 
-  override val uastParent: UElement? by lazy(LazyThreadSafetyMode.NONE) {
-    givenParent ?: sourcePsi.parent?.toUElement()
-  }
+  override val uastParent: UElement?
+    get() = uastParentPart.getOrBuild {
+      givenParent ?: sourcePsi.parent?.toUElement()
+    }
 
   val text: String
     get() = asSourceString()