diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
index 485e3b5b6aac..b5dd1b31eac4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
@@ -749,6 +749,10 @@ public class GenericsHighlightUtil {
               JavaPsiFacade.getInstance(typeParameter.getProject()).getElementFactory().createType(castClass, modifiedSubstitutor);
             if (TypeConversionUtil.isAssignable(operandType, otherType, false)) return true;
           }
+          for (PsiTypeParameter typeParameter : PsiUtil.typeParametersIterable(operandClass)) {
+            final PsiType operand = operandResult.getSubstitutor().substitute(typeParameter);
+            if (operand instanceof PsiCapturedWildcardType) return true;
+          }
           return false;
         }
         return true;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/UncheckedCasts.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/UncheckedCasts.java
index 76ab83f8b925..0532d1f1f6ce 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/UncheckedCasts.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/UncheckedCasts.java
@@ -70,3 +70,39 @@ class UncheckedCastFalsePositive {
     }
 
 }
+
+class IDEA21547 {
+  class O {}
+  class A<<warning descr="Type parameter 'T' is never used">T</warning>> {}
+  class B<K extends O> extends A<K>{}
+
+  public void bar(A<? extends O> a, B<O> b) {
+    b = <warning descr="Unchecked cast: 'IDEA21547.A<capture<? extends IDEA21547.O>>' to 'IDEA21547.B<IDEA21547.O>'">(B<O>)a</warning>;
+    System.out.println(b);
+  }
+
+  public void bar1(A<?> a, B<O> b) {
+    b = <warning descr="Unchecked cast: 'IDEA21547.A<capture<?>>' to 'IDEA21547.B<IDEA21547.O>'">(B<O>)a</warning>;
+    System.out.println(b);
+  }
+
+  public void bar2(A<?> a, B<?> b) {
+    b = <warning descr="Unchecked cast: 'IDEA21547.A<capture<?>>' to 'IDEA21547.B<IDEA21547.O>'">(B<O>)a</warning>;
+    System.out.println(b);
+  }
+
+  public void bar4(A<? extends O> a, B<?> b) {
+    b = <warning descr="Unchecked cast: 'IDEA21547.A<capture<? extends IDEA21547.O>>' to 'IDEA21547.B<IDEA21547.O>'">(B<O>)a</warning>;
+    System.out.println(b);
+  }
+
+  public void bar5(A<? super O> a, B<?> b) {
+    b = <warning descr="Unchecked cast: 'IDEA21547.A<capture<? super IDEA21547.O>>' to 'IDEA21547.B<IDEA21547.O>'">(B<O>)a</warning>;
+    System.out.println(b);
+  }
+
+  public void bar6(A a, B<?> b) {
+    b = <warning descr="Unchecked cast: 'IDEA21547.A' to 'IDEA21547.B<IDEA21547.O>'">(B<O>)a</warning>;
+    System.out.println(b);
+  }
+}