diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
index e82b0f12a35..c213f22cbc5 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
@@ -828,8 +828,13 @@ class JavaToJKTreeBuilder constructor(
                                         emptyList()
                                     ).withAssignedNonCodeElements(statement)
                             else ->
-                                //TODO Handle case then there is no last case
                                 cases.lastOrNull()?.also { it.statements = it.statements + statement.toJK() }
+                                    ?: run {
+                                        cases += JKJavaLabelSwitchCaseImpl(
+                                            JKStubExpressionImpl(),
+                                            listOf(statement.toJK())
+                                        )
+                                    }
                         }
                     }
                     JKJavaSwitchStatementImpl(with(expressionTreeMapper) { expression.toJK() }, cases)