diff --git a/lib/compress.js b/lib/compress.js
index 4e45df929fd..97ae9ee5b44 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -1749,8 +1749,13 @@ merge(Compressor.prototype, {
                     extract_declarations_from_unreachable_code(compressor, self.body, a);
                     return make_node(AST_BlockStatement, self, { body: a });
                 }
+            } else {
+                return self.body;
             }
         }
+        if (self instanceof AST_While) {
+            return make_node(AST_For, self, self).optimize(compressor);
+        }
         return self;
     });
 
@@ -1799,16 +1804,6 @@ merge(Compressor.prototype, {
         }
     };
 
-    OPT(AST_While, function(self, compressor) {
-        if (!compressor.option("loops")) return self;
-        self = AST_DWLoop.prototype.optimize.call(self, compressor);
-        if (self instanceof AST_While) {
-            if_break_in_loop(self, compressor);
-            self = make_node(AST_For, self, self).transform(compressor);
-        }
-        return self;
-    });
-
     OPT(AST_For, function(self, compressor){
         var cond = self.condition;
         if (cond) {
diff --git a/test/compress/loops.js b/test/compress/loops.js
index 78f618aa8f7..ca05461c303 100644
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -187,3 +187,32 @@ keep_collapse_const_in_own_block_scope_2: {
         console.log(c);
     }
 }
+
+evaluate: {
+    options = {
+        loops: true,
+        dead_code: true,
+        evaluate: true,
+    };
+    input: {
+        while (true) {
+            a();
+        }
+        while (false) {
+            b();
+        }
+        do {
+            c();
+        } while (true);
+        do {
+            d();
+        } while (false);
+    }
+    expect: {
+        for(;;)
+            a();
+        for(;;)
+            c();
+        d();
+    }
+}