diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
index 83460fb4abe..b91d015ec6c 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
@@ -21,14 +21,13 @@ class JetbrainsNullableAnnotationsConverter(context: NewJ2kConverterContext) : R
         for (annotation in element.annotationList.annotations) {
             val nullability = annotation.annotationNullability() ?: continue
             when (element) {
-                is JKVariable -> {
-                    annotationsToRemove += annotation
-                    element.type = JKTypeElement(element.type.type.updateNullability(nullability))
-                }
-                is JKMethod -> {
-                    annotationsToRemove += annotation
-                    element.returnType = JKTypeElement(element.returnType.type.updateNullability(nullability))
-                }
+                is JKVariable -> element.type
+                is JKMethod -> element.returnType
+                is JKTypeElement -> element
+                else -> null
+            }?.let { typeElement ->
+                annotationsToRemove += annotation
+                typeElement.type = typeElement.type.updateNullability(nullability)
             }
         }
         element.annotationList.annotations -= annotationsToRemove