diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
index 58a85c9bbd9..b23c4a0db7e 100644
--- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
@@ -1930,6 +1930,12 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
                 runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
             }
 
+            @Test
+            @TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
+            public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
+                runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
+            }
+
             @Test
             @TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
             public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
index 0ede2920aad..2e701ad6bdb 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
@@ -264,7 +264,7 @@ internal object KDocReferenceResolver {
 
             else -> {
                 getClassOrObjectSymbolByClassId(classId)
-                    ?.getCombinedMemberScope()
+                    ?.getCompositeCombinedMemberAndCompanionObjectScope()
                     ?.getCallableSymbols(callableId.callableName)
                     ?.let(::addAll)
             }
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
index 4ccf4a2816f..2ba29339668 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
@@ -1930,6 +1930,12 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
                 runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
             }
 
+            @Test
+            @TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
+            public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
+                runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
+            }
+
             @Test
             @TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
             public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
index c6ba72ee56b..92782881edd 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
@@ -1930,6 +1930,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
                 runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
             }
 
+            @Test
+            @TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
+            public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
+                runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
+            }
+
             @Test
             @TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
             public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
index 6a6f6c185ef..20a706def6e 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
@@ -1930,6 +1930,12 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
                 runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
             }
 
+            @Test
+            @TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
+            public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
+                runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
+            }
+
             @Test
             @TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
             public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt b/analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt
new file mode 100644
index 00000000000..4fe0f54ad4f
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt
@@ -0,0 +1,16 @@
+// FILE: A.kt
+package bar
+
+class A {
+    companion object {
+        fun toName(): String = ""
+    }
+}
+
+// FILE: main.kt
+package baz
+
+/**
+ * [bar.A.<caret>toName.length]
+ */
+fun foo() {}
diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.txt
new file mode 100644
index 00000000000..8b86c966d40
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.txt
@@ -0,0 +1,2 @@
+Resolved to:
+0: (in bar.A.Companion) fun toName(): kotlin.String