diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index 1aa953305e5..d51d3f5a427 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -38886,6 +38886,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                 runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInAnonymousObject.kt");
             }
 
+            @Test
+            @TestMetadata("overrideInPrimaryConstructor.kt")
+            public void testOverrideInPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt");
+            }
+
             @Test
             @TestMetadata("subClassOptInModality.kt")
             public void testSubClassOptInModality() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index 0a0fbdb957a..48e7ea3c3e3 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -38886,6 +38886,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                 runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInAnonymousObject.kt");
             }
 
+            @Test
+            @TestMetadata("overrideInPrimaryConstructor.kt")
+            public void testOverrideInPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt");
+            }
+
             @Test
             @TestMetadata("subClassOptInModality.kt")
             public void testSubClassOptInModality() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 51aaaafe160..28f6940ebeb 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -38982,6 +38982,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                 runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInAnonymousObject.kt");
             }
 
+            @Test
+            @TestMetadata("overrideInPrimaryConstructor.kt")
+            public void testOverrideInPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt");
+            }
+
             @Test
             @TestMetadata("subClassOptInModality.kt")
             public void testSubClassOptInModality() throws Exception {
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt
index 90add74fd5b..ed6dce95cd0 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.*
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.declarations.utils.correspondingValueParameterFromPrimaryConstructor
 import org.jetbrains.kotlin.fir.expressions.FirConstExpression
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
 import org.jetbrains.kotlin.fir.references.resolved
@@ -329,8 +330,22 @@ object FirOptInUsageBaseChecker {
         annotationClassId: ClassId,
         fromSupertype: Boolean
     ): Boolean {
-        return getAnnotationByClassId(annotationClassId, session) != null || isAnnotatedWithOptIn(annotationClassId, session) ||
-                fromSupertype && isAnnotatedWithSubclassOptInRequired(session, annotationClassId)
+        return getAnnotationByClassId(annotationClassId, session) != null ||
+                isAnnotatedWithOptIn(annotationClassId, session) ||
+                fromSupertype && isAnnotatedWithSubclassOptInRequired(session, annotationClassId) ||
+                // Technically wrong but required for K1 compatibility
+                primaryConstructorParameterIsExperimentalityAcceptable(session, annotationClassId)
+    }
+
+    @OptIn(SymbolInternals::class)
+    private fun FirAnnotationContainer.primaryConstructorParameterIsExperimentalityAcceptable(
+        session: FirSession,
+        annotationClassId: ClassId
+    ): Boolean {
+        if (this !is FirProperty) return false
+        val parameterSymbol = correspondingValueParameterFromPrimaryConstructor ?: return false
+
+        return parameterSymbol.fir.isExperimentalityAcceptable(session, annotationClassId, fromSupertype = false)
     }
 
     private fun FirAnnotationContainer.isAnnotatedWithOptIn(annotationClassId: ClassId, session: FirSession): Boolean {
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt
index e5e68377bfb..dd3b697d286 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt
@@ -120,9 +120,12 @@ fun FirDeclaration.getDanglingTypeConstraintsOrEmpty(): List<DanglingTypeConstra
 }
 
 val FirPropertySymbol.correspondingValueParameterFromPrimaryConstructor: FirValueParameterSymbol?
+    get() = fir.correspondingValueParameterFromPrimaryConstructor
+
+val FirProperty.correspondingValueParameterFromPrimaryConstructor: FirValueParameterSymbol?
     get() {
-        if (!fromPrimaryConstructor) return null
-        val initializer = resolvedInitializer as? FirPropertyAccessExpression ?: return null
+        if (fromPrimaryConstructor != true) return null
+        val initializer = initializer as? FirPropertyAccessExpression ?: return null
         val reference = initializer.calleeReference as? FirPropertyFromParameterResolvedNamedReference ?: return null
         return reference.resolvedSymbol as? FirValueParameterSymbol
     }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt
new file mode 100644
index 00000000000..b074bbaee85
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt
@@ -0,0 +1,15 @@
+// SKIP_TXT
+// FIR_IDENTICAL
+
+@RequiresOptIn(level = RequiresOptIn.Level.ERROR)
+annotation class E
+
+abstract class Foo {
+    @E
+    abstract val bar: String
+}
+
+class SubFoo(
+    @OptIn(E::class)
+    override val bar: String,
+) : Foo()
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 77c607ea41c..47ecba0f7b7 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -38982,6 +38982,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInAnonymousObject.kt");
             }
 
+            @Test
+            @TestMetadata("overrideInPrimaryConstructor.kt")
+            public void testOverrideInPrimaryConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideInPrimaryConstructor.kt");
+            }
+
             @Test
             @TestMetadata("subClassOptInModality.kt")
             public void testSubClassOptInModality() throws Exception {