diff --git a/lib/compress.js b/lib/compress.js
index 0d4f7abc3d..c655803060 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -2428,6 +2428,7 @@ merge(Compressor.prototype, {
                     if (parent.condition !== node) return node;
                     return find_stop_value(parent, level + 1);
                 }
+                if (parent instanceof AST_Yield) return find_stop_value(parent, level + 1);
                 return null;
             }
 
diff --git a/test/compress/yields.js b/test/compress/yields.js
index 05972e53ab..d21ebcbff1 100644
--- a/test/compress/yields.js
+++ b/test/compress/yields.js
@@ -247,6 +247,30 @@ collapse_vars_4: {
     node_version: ">=4"
 }
 
+collapse_vars_5: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = function* f(b, c) {
+            b = yield c = b;
+            console.log(c);
+        }("PASS");
+        a.next();
+        a.next("FAIL");
+    }
+    expect: {
+        var a = function* f(b, c) {
+            b = yield c = b;
+            console.log(c);
+        }("PASS");
+        a.next();
+        a.next("FAIL");
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
 collapse_property_lambda: {
     options = {
         collapse_vars: true,