diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.kt
new file mode 100644
index 00000000000..611c9585d19
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.kt
@@ -0,0 +1,10 @@
+// !USE_EXPERIMENTAL: kotlin.RequiresOptIn
+
+@OptIn(ExperimentalStdlibApi::class)
+val list: List<String> = buildList {
+    val inner: List<String> = maybe() ?: emptyList()
+
+    addAll(inner)
+}
+
+fun maybe(): List<String>? = null
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.txt
new file mode 100644
index 00000000000..f71b25a6239
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.txt
@@ -0,0 +1,4 @@
+package
+
+@kotlin.OptIn(markerClass = {kotlin.ExperimentalStdlibApi::class}) public val list: kotlin.collections.List<kotlin.String>
+public fun maybe(): kotlin.collections.List<kotlin.String>?
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
index b39c6708a82..9d6f2f995f8 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
@@ -2037,6 +2037,11 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
                 runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt");
             }
 
+            @TestMetadata("kt38420.kt")
+            public void testKt38420() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.kt");
+            }
+
             @TestMetadata("nestedLambdaInferenceWithListMap.kt")
             public void testNestedLambdaInferenceWithListMap() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/nestedLambdaInferenceWithListMap.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
index 75c2f25b83e..04008637099 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
@@ -2037,6 +2037,11 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
                 runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt");
             }
 
+            @TestMetadata("kt38420.kt")
+            public void testKt38420() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38420.kt");
+            }
+
             @TestMetadata("nestedLambdaInferenceWithListMap.kt")
             public void testNestedLambdaInferenceWithListMap() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/nestedLambdaInferenceWithListMap.kt");