diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
index 07cf3caab57..de8ffa10346 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
@@ -456,14 +456,14 @@ object LowLevelFirApiFacadeForResolveOnAir {
 
     private fun bodyResolveRequired(container: KtDeclaration, elementToReplace: PsiElement): Boolean = when {
         container == elementToReplace -> true
-        container is KtDeclarationWithBody -> container.bodyExpression?.isAncestor(elementToReplace)
-        container is KtProperty -> container.delegateExpressionOrInitializer?.isAncestor(elementToReplace)
-        container is KtParameter -> container.defaultValue?.isAncestor(elementToReplace)
+        container is KtDeclarationWithBody -> container.bodyExpression.isAncestor(elementToReplace)
+        container is KtProperty -> container.delegateExpressionOrInitializer.isAncestor(elementToReplace)
+        container is KtParameter -> container.defaultValue.isAncestor(elementToReplace)
         container is KtEnumEntry -> {
-            container.initializerList?.isAncestor(elementToReplace) == true || container.body?.isAncestor(elementToReplace) == true
+            container.initializerList.isAncestor(elementToReplace) || container.body.isAncestor(elementToReplace)
         }
 
         container is KtScript || container is KtAnonymousInitializer -> true
         else -> false
-    } == true
+    }
 }