diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
index 7282d1d1fda..bb6941b3416 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
@@ -239,6 +239,20 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
     }
 
     override fun visitWhen(expression: IrWhen, context: JsGenerationContext): JsExpression {
+        if (expression.origin == IrStatementOrigin.ANDAND) {
+            return JsBinaryOperation(
+                JsBinaryOperator.AND,
+                expression.branches[0].condition.accept(this, context),
+                expression.branches[0].result.accept(this, context)
+            )
+        }
+        if (expression.origin == IrStatementOrigin.OROR) {
+            return JsBinaryOperation(
+                JsBinaryOperator.OR,
+                expression.branches[0].condition.accept(this, context),
+                expression.branches[1].result.accept(this, context)
+            )
+        }
         val lastBranch = expression.branches.lastOrNull()
         val implicitElse =
             if (lastBranch == null || !isElseBranch(lastBranch))
diff --git a/compiler/testData/debug/stepping/constantConditions.kt b/compiler/testData/debug/stepping/constantConditions.kt
index 1f523ba04e8..65c33357446 100644
--- a/compiler/testData/debug/stepping/constantConditions.kt
+++ b/compiler/testData/debug/stepping/constantConditions.kt
@@ -25,6 +25,7 @@ fun test(): Long {
 
 // EXPECTATIONS JS_IR
 // test.kt:6 box
+// test.kt:10 test
 // test.kt:12 test
 // test.kt:7 box
 
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6BoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6BoxTestGenerated.java
index 06bc482ad50..c0771a59680 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6BoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6BoxTestGenerated.java
@@ -7270,6 +7270,12 @@ public class FirJsES6BoxTestGenerated extends AbstractFirJsES6BoxTest {
       runTest("js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunction.kt");
     }
 
+    @Test
+    @TestMetadata("logicalOperators.kt")
+    public void testLogicalOperators() {
+      runTest("js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt");
+    }
+
     @Test
     @TestMetadata("tempVarDeclOnAssignment.kt")
     public void testTempVarDeclOnAssignment() {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsBoxTestGenerated.java
index a58db58f113..020ae58dce5 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsBoxTestGenerated.java
@@ -7164,6 +7164,12 @@ public class FirLightTreeJsBoxTestGenerated extends AbstractFirLightTreeJsBoxTes
       runTest("js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunction.kt");
     }
 
+    @Test
+    @TestMetadata("logicalOperators.kt")
+    public void testLogicalOperators() {
+      runTest("js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt");
+    }
+
     @Test
     @TestMetadata("tempVarDeclOnAssignment.kt")
     public void testTempVarDeclOnAssignment() {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsBoxTestGenerated.java
index 1cf3be8e58d..29652c8faf4 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsBoxTestGenerated.java
@@ -7164,6 +7164,12 @@ public class FirPsiJsBoxTestGenerated extends AbstractFirPsiJsBoxTest {
       runTest("js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunction.kt");
     }
 
+    @Test
+    @TestMetadata("logicalOperators.kt")
+    public void testLogicalOperators() {
+      runTest("js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt");
+    }
+
     @Test
     @TestMetadata("tempVarDeclOnAssignment.kt")
     public void testTempVarDeclOnAssignment() {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.java
index cb913a6e1a8..e68f33f6171 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.java
@@ -7270,6 +7270,12 @@ public class IrBoxJsES6TestGenerated extends AbstractIrBoxJsES6Test {
       runTest("js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunction.kt");
     }
 
+    @Test
+    @TestMetadata("logicalOperators.kt")
+    public void testLogicalOperators() {
+      runTest("js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt");
+    }
+
     @Test
     @TestMetadata("tempVarDeclOnAssignment.kt")
     public void testTempVarDeclOnAssignment() {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
index a1d1ccdff50..86ba9ba6e91 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
@@ -7164,6 +7164,12 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
       runTest("js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunction.kt");
     }
 
+    @Test
+    @TestMetadata("logicalOperators.kt")
+    public void testLogicalOperators() {
+      runTest("js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt");
+    }
+
     @Test
     @TestMetadata("tempVarDeclOnAssignment.kt")
     public void testTempVarDeclOnAssignment() {
diff --git a/js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunctionTest.js b/js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunctionTest.js
index d0e8517978b..3c11dfa65d9 100644
--- a/js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunctionTest.js
+++ b/js/js.translator/testData/box/jsAstOptimizations/inlineEmptyFunctionTest.js
@@ -7,7 +7,7 @@ function box() {
   if (!(flag1 === 0)) {
     var tmp;
     var tmp_0;
-    if (equals(OK, 'OK') ? flag1 === 1 : false) {
+    if (equals(OK, 'OK') && flag1 === 1) {
       var tmp_1 = flag2;
       tmp_0 = typeof tmp_1 === 'number';
     } else {
@@ -26,7 +26,7 @@ function box() {
   if (!(flag1 === 0)) {
     var tmp_2;
     var tmp_3;
-    if (equals(OK, 'OK') ? flag1 === 1 : false) {
+    if (equals(OK, 'OK') && flag1 === 1) {
       var tmp_4 = flag2;
       tmp_3 = typeof tmp_4 === 'number';
     } else {
diff --git a/js/js.translator/testData/box/jsAstOptimizations/logicalOperators.js b/js/js.translator/testData/box/jsAstOptimizations/logicalOperators.js
new file mode 100644
index 00000000000..aae5f8b5212
--- /dev/null
+++ b/js/js.translator/testData/box/jsAstOptimizations/logicalOperators.js
@@ -0,0 +1,3 @@
+function test() {
+  return (!a || (b && c)) && foo() || bar();
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt b/js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt
new file mode 100644
index 00000000000..92481107dee
--- /dev/null
+++ b/js/js.translator/testData/box/jsAstOptimizations/logicalOperators.kt
@@ -0,0 +1,13 @@
+val a = true
+val b = true
+val c = true
+
+fun foo() = true
+fun bar() = true
+
+// EXPECT_GENERATED_JS: function=test expect=logicalOperators.js
+fun test(): Boolean = (!a || (b && c)) && foo() || bar()
+
+fun box(): String {
+    return if (test()) "OK" else "FAILED"
+}