diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
index e0917860dbad..1f03e144be73 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
@@ -233,7 +233,11 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
           final PsiType result = substituteTypeParameter(typeParameter);
           if (result != null) {
             PsiUtil.ensureValidType(result);
-            if (false) {
+            if (result instanceof PsiImmediateClassType ||
+                result instanceof PsiClassReferenceType ||
+                result instanceof TypeCorrector.PsiCorrectedClassType ||
+                result instanceof PsiArrayType ||
+                result instanceof PsiWildcardType) {
               return result.annotate(new TypeAnnotationProvider() {
                 @NotNull
                 @Override
@@ -243,7 +247,7 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
               });
             }
           }
-          return null;
+          return result;
         }
         return classType;
       }