diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 88dcb91faa..929d737700 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -83,7 +83,7 @@ class DomGenerator extends Generator {
 			properties.addBlock( deindent`
 				teardown: function ( detach ) {
 					${fragment.builders.teardown}
-				},
+				}
 			` );
 		}
 
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 540713f360..ab953188e4 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -31,7 +31,7 @@ export default {
 
 		// Component has children, put them in a separate {{yield}} block
 		if ( hasChildren ) {
-			const yieldName = generator.current.getUniqueName( `render${name}YieldFragment` );
+			const yieldName = generator.getUniqueName( `render${name}YieldFragment` );
 
 			generator.generateBlock( node, yieldName );
 
diff --git a/test/generator/component-yield-multiple-in-if/Widget.html b/test/generator/component-yield-multiple-in-if/Widget.html
new file mode 100644
index 0000000000..2dddb1946f
--- /dev/null
+++ b/test/generator/component-yield-multiple-in-if/Widget.html
@@ -0,0 +1 @@
+<p class='widget'>{{yield}}</p>
diff --git a/test/generator/component-yield-multiple-in-if/_config.js b/test/generator/component-yield-multiple-in-if/_config.js
new file mode 100644
index 0000000000..7ba8c6c497
--- /dev/null
+++ b/test/generator/component-yield-multiple-in-if/_config.js
@@ -0,0 +1,14 @@
+export default {
+	solo: true,
+
+	html: `
+		<div><p class='widget'>Hello</p></div>
+	`,
+
+	test ( assert, component, target ) {
+		component.set({ arriving: false });
+		assert.htmlEqual( target.innerHTML, `<div><p class='widget'>Goodbye</p></div>` );
+
+		component.teardown();
+	}
+};
diff --git a/test/generator/component-yield-multiple-in-if/main.html b/test/generator/component-yield-multiple-in-if/main.html
new file mode 100644
index 0000000000..e1d380e647
--- /dev/null
+++ b/test/generator/component-yield-multiple-in-if/main.html
@@ -0,0 +1,23 @@
+<div>
+	{{#if arriving}}
+		<Widget>Hello</Widget>
+	{{else}}
+		<Widget>Goodbye</Widget>
+	{{/if}}
+</div>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		data () {
+			return {
+				arriving: true
+			}
+		},
+
+		components: {
+			Widget
+		}
+	};
+</script>