diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirSimpleNameReference.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirSimpleNameReference.kt
index 2261fcff941..84b056cf42c 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirSimpleNameReference.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirSimpleNameReference.kt
@@ -51,8 +51,12 @@ internal class KtFirSimpleNameReference(
         referenceTargetSymbols.flatMap { symbol ->
             when (symbol) {
                 is KtFirSyntheticJavaPropertySymbol ->
-                    if (isRead) listOfNotNull(symbol.javaGetterSymbol.psi)
-                    else listOfNotNull(symbol.javaSetterSymbol?.psi)
+                    if (isRead) {
+                        listOfNotNull(symbol.javaGetterSymbol.psi)
+                    } else {
+                        if (symbol.javaSetterSymbol == null) listOfNotNull(symbol.javaGetterSymbol.psi)
+                        else listOfNotNull(symbol.javaSetterSymbol?.psi)
+                    }
                 else -> listOfNotNull(symbol.psi)
             }
         }
diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt
index c9bbe567234..f82f49387f8 100644
--- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt
+++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt
@@ -32,7 +32,8 @@ class Fe10SyntheticPropertyAccessorReference(
                 if (getter) {
                     result.add(descriptor.getMethod)
                 } else {
-                    result.addIfNotNull(descriptor.setMethod)
+                    if (descriptor.setMethod == null) result.addIfNotNull(descriptor.getMethod)
+                    else result.addIfNotNull(descriptor.setMethod)
                 }
             }
         }