diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 50bcc984660f..540713f3606e 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -36,7 +36,7 @@ export default {
 			generator.generateBlock( node, yieldName );
 
 			generator.current.builders.init.addLine(
-				`var ${name}_yieldFragment = ${yieldName}( root, component );`
+				`var ${name}_yieldFragment = ${yieldName}( ${generator.current.params}, component );`
 			);
 
 			generator.current.builders.update.addLine(
diff --git a/test/generator/component-yield-multiple-in-each/Widget.html b/test/generator/component-yield-multiple-in-each/Widget.html
new file mode 100644
index 000000000000..e147954fa0e7
--- /dev/null
+++ b/test/generator/component-yield-multiple-in-each/Widget.html
@@ -0,0 +1 @@
+<p>{{yield}}</p>
diff --git a/test/generator/component-yield-multiple-in-each/_config.js b/test/generator/component-yield-multiple-in-each/_config.js
new file mode 100644
index 000000000000..6a4c62702bdd
--- /dev/null
+++ b/test/generator/component-yield-multiple-in-each/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<p>Hello Alice</p><p>Hello Bob</p><p>Hello Charles</p>'
+};
diff --git a/test/generator/component-yield-multiple-in-each/main.html b/test/generator/component-yield-multiple-in-each/main.html
new file mode 100644
index 000000000000..149e98549cee
--- /dev/null
+++ b/test/generator/component-yield-multiple-in-each/main.html
@@ -0,0 +1,19 @@
+{{#each people as person}}
+	<Widget>Hello {{person}}</Widget>
+{{/each}}
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		data () {
+			return {
+				people: [ 'Alice', 'Bob', 'Charles' ]
+			};
+		},
+
+		components: {
+			Widget
+		}
+	};
+</script>