diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
index 27442f80a37..173493b583e 100644
--- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
+++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
@@ -860,8 +860,8 @@ class ExpressionsConverter(
         return FirWhenExpressionImpl(null, null, null).apply {
             val trueBranch = convertLoopBody(thenBlock)
             branches += FirWhenBranchImpl(null, firCondition, trueBranch)
-            elseBlock?.let {
-                val elseBranch = convertLoopBody(it)
+            val elseBranch = convertLoopBody(elseBlock)
+            if (elseBranch !is FirEmptyExpressionBlock) {
                 branches += FirWhenBranchImpl(
                     null, FirElseIfTrueCondition(null), elseBranch
                 )