diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt
index 4ecdeb9444f..f1d4ede334e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt
@@ -108,7 +108,9 @@ class FirCallCompletionResultsWriterTransformer(
             .transformDispatchReceiver(StoreReceiver, subCandidate.dispatchReceiverExpression())
             .transformExtensionReceiver(StoreReceiver, subCandidate.extensionReceiverExpression()) as T
         result.replaceTypeRef(typeRef)
-        result.replaceTypeArguments(typeArguments)
+        if (declaration !is FirErrorFunction) {
+            result.replaceTypeArguments(typeArguments)
+        }
         return result
     }
 
diff --git a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt
index d3fff3880a5..00c3c14227e 100644
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt
+++ b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt
@@ -7,7 +7,7 @@ fun foo(a : Any?) {}
 
 public fun main() {
     getT<<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
-    <!UNRESOLVED_REFERENCE!>ggetT<!><*>()
+    <!UNRESOLVED_REFERENCE!>ggetT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
     getTT<<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
     getTT<<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, Int>()
     getTT<Int, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveTypeArgsForUnresolvedCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/resolveTypeArgsForUnresolvedCall.fir.kt
index 6baf4a9ebe5..4994cdbaeba 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveTypeArgsForUnresolvedCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/resolveTypeArgsForUnresolvedCall.fir.kt
@@ -1,4 +1,4 @@
 fun foo() {
-    <!UNRESOLVED_REFERENCE!>x<!>.<!UNRESOLVED_REFERENCE!>yyy<!><XXX>()
+    <!UNRESOLVED_REFERENCE!>x<!>.<!UNRESOLVED_REFERENCE!>yyy<!><<!UNRESOLVED_REFERENCE!>XXX<!>>()
     <!UNRESOLVED_REFERENCE!>x<!>.<!UNRESOLVED_REFERENCE!>yyy<!><Int>()
 }
\ No newline at end of file
diff --git a/idea/testData/resolve/references/AnnotationParameter.kt b/idea/testData/resolve/references/AnnotationParameter.kt
index ce6c470b630..4b4995b1fda 100644
--- a/idea/testData/resolve/references/AnnotationParameter.kt
+++ b/idea/testData/resolve/references/AnnotationParameter.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 package testing
 
 annotation class Annotation<T>(val clazz: Class<T>)