diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compile/render-dom/wrappers/InlineComponent/index.ts
index bc13014a29..870296a035 100644
--- a/src/compile/render-dom/wrappers/InlineComponent/index.ts
+++ b/src/compile/render-dom/wrappers/InlineComponent/index.ts
@@ -112,7 +112,6 @@ export default class InlineComponentWrapper extends Wrapper {
 
 		const statements: string[] = [];
 		const updates: string[] = [];
-		const postupdates: string[] = [];
 
 		let props;
 		const name_changes = block.get_unique_name(`${name}_changes`);
@@ -311,8 +310,6 @@ export default class InlineComponentWrapper extends Wrapper {
 				}
 			`);
 
-			postupdates.push(updating);
-
 			const contextual_dependencies = Array.from(binding.expression.contextual_dependencies);
 			const dependencies = Array.from(binding.expression.dependencies);
 
@@ -333,9 +330,9 @@ export default class InlineComponentWrapper extends Wrapper {
 
 				block.builders.init.add_block(deindent`
 					function ${name}(value) {
-						if (ctx.${name}.call(null, value, ctx)) {
-							${updating} = true;
-						}
+						ctx.${name}.call(null, value, ctx);
+						${updating} = true;
+						@add_flush_callback(() => ${updating} = false);
 					}
 				`);
 
@@ -343,9 +340,9 @@ export default class InlineComponentWrapper extends Wrapper {
 			} else {
 				block.builders.init.add_block(deindent`
 					function ${name}(value) {
-						if (ctx.${name}.call(null, value)) {
-							${updating} = true;
-						}
+						ctx.${name}.call(null, value);
+						${updating} = true;
+						@add_flush_callback(() => ${updating} = false);
 					}
 				`);
 			}
@@ -353,7 +350,7 @@ export default class InlineComponentWrapper extends Wrapper {
 			const body = deindent`
 				function ${name}(${args.join(', ')}) {
 					${lhs} = value;
-					return ${component.invalidate(dependencies[0])}
+					${component.invalidate(dependencies[0])};
 				}
 			`;
 
@@ -452,8 +449,6 @@ export default class InlineComponentWrapper extends Wrapper {
 					else if (${switch_value}) {
 						${name}.$set(${name_changes});
 					}
-
-					${postupdates.length > 0 && `${postupdates.join(' = ')} = false;`}
 				`);
 			}
 
@@ -497,7 +492,6 @@ export default class InlineComponentWrapper extends Wrapper {
 				block.builders.update.add_block(deindent`
 					${updates}
 					${name}.$set(${name_changes});
-					${postupdates.length > 0 && `${postupdates.join(' = ')} = false;`}
 				`);
 			}
 
diff --git a/src/internal/Component.js b/src/internal/Component.js
index a0be4b9895..530a48da59 100644
--- a/src/internal/Component.js
+++ b/src/internal/Component.js
@@ -85,15 +85,9 @@ export function init(component, options, instance, create_fragment, not_equal, p
 
 	$$.ctx = instance
 		? instance(component, props, (key, value) => {
-			if ($$.ctx) {
-				const changed = not_equal(value, $$.ctx[key]);
-				if (ready && changed) {
-					if ($$.bound[key]) $$.bound[key](value);
-					make_dirty(component, key);
-				}
-
-				$$.ctx[key] = value;
-				return changed;
+			if ($$.ctx && not_equal($$.ctx[key], $$.ctx[key] = value)) {
+				if ($$.bound[key]) $$.bound[key](value);
+				if (ready) make_dirty(component, key);
 			}
 		})
 		: props;
diff --git a/src/internal/scheduler.js b/src/internal/scheduler.js
index b2b5bd5200..bc4f01197b 100644
--- a/src/internal/scheduler.js
+++ b/src/internal/scheduler.js
@@ -7,6 +7,7 @@ export const intros = { enabled: false };
 let update_promise;
 const binding_callbacks = [];
 const render_callbacks = [];
+const flush_callbacks = [];
 
 export function schedule_update() {
 	if (!update_promise) {
@@ -15,10 +16,6 @@ export function schedule_update() {
 	}
 }
 
-export function add_render_callback(fn) {
-	render_callbacks.push(fn);
-}
-
 export function tick() {
 	schedule_update();
 	return update_promise;
@@ -28,6 +25,14 @@ export function add_binding_callback(fn) {
 	binding_callbacks.push(fn);
 }
 
+export function add_render_callback(fn) {
+	render_callbacks.push(fn);
+}
+
+export function add_flush_callback(fn) {
+	flush_callbacks.push(fn);
+}
+
 export function flush() {
 	const seen_callbacks = new Set();
 
@@ -56,6 +61,10 @@ export function flush() {
 		}
 	} while (dirty_components.length);
 
+	while (flush_callbacks.length) {
+		flush_callbacks.pop()();
+	}
+
 	update_promise = null;
 }
 
diff --git a/test/runtime/samples/component-binding-blowback-d/One.svelte b/test/runtime/samples/component-binding-blowback-d/One.svelte
index e2e86b1bf7..f86da72ff2 100644
--- a/test/runtime/samples/component-binding-blowback-d/One.svelte
+++ b/test/runtime/samples/component-binding-blowback-d/One.svelte
@@ -2,14 +2,15 @@
 	import Two from './Two.svelte';
 
 	export let list;
+	export let i;
 
 	function handle_click() {
 		list = [...list, {}];
 	}
 </script>
 
-{#each list as item}
-	<Two bind:value={item.value}/>
+{#each list as item, j}
+	<Two bind:value={item.value} {i} {j}/>
 {/each}
 
 <button on:click={handle_click}>
diff --git a/test/runtime/samples/component-binding-blowback-d/Two.svelte b/test/runtime/samples/component-binding-blowback-d/Two.svelte
index 4f55f14124..b33a987b75 100644
--- a/test/runtime/samples/component-binding-blowback-d/Two.svelte
+++ b/test/runtime/samples/component-binding-blowback-d/Two.svelte
@@ -1,3 +1,4 @@
 <script>
-	export let value = 'x';
+	export let i, j;
+	export let value = `${i}:${j}`;
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-d/_config.js b/test/runtime/samples/component-binding-blowback-d/_config.js
index fe1164f100..1716eb6ff9 100644
--- a/test/runtime/samples/component-binding-blowback-d/_config.js
+++ b/test/runtime/samples/component-binding-blowback-d/_config.js
@@ -3,7 +3,7 @@ export default {
 		<button>click me</button>
 		<button>click me</button>
 
-		<p>{"value":"x"}</p>
+		<p>{"value":"0:0"}</p>
 		<p></p>
 	`,
 
@@ -16,8 +16,8 @@ export default {
 			<button>click me</button>
 			<button>click me</button>
 
-			<p>{"value":"x"}</p>
-			<p>{"value":"x"}</p>
+			<p>{"value":"0:0"}</p>
+			<p>{"value":"1:0"}</p>
 		`);
 	}
 };
diff --git a/test/runtime/samples/component-binding-blowback-d/main.svelte b/test/runtime/samples/component-binding-blowback-d/main.svelte
index 5690b33813..d6e9412618 100644
--- a/test/runtime/samples/component-binding-blowback-d/main.svelte
+++ b/test/runtime/samples/component-binding-blowback-d/main.svelte
@@ -7,8 +7,8 @@
 	};
 </script>
 
-<One bind:list={obj.a}/>
-<One bind:list={obj.b}/>
+<One bind:list={obj.a} i={0}/>
+<One bind:list={obj.b} i={1}/>
 
 <p>{obj.a.map(JSON.stringify)}</p>
 <p>{obj.b.map(JSON.stringify)}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-e/One.svelte b/test/runtime/samples/component-binding-blowback-e/One.svelte
index e2e86b1bf7..f86da72ff2 100644
--- a/test/runtime/samples/component-binding-blowback-e/One.svelte
+++ b/test/runtime/samples/component-binding-blowback-e/One.svelte
@@ -2,14 +2,15 @@
 	import Two from './Two.svelte';
 
 	export let list;
+	export let i;
 
 	function handle_click() {
 		list = [...list, {}];
 	}
 </script>
 
-{#each list as item}
-	<Two bind:value={item.value}/>
+{#each list as item, j}
+	<Two bind:value={item.value} {i} {j}/>
 {/each}
 
 <button on:click={handle_click}>
diff --git a/test/runtime/samples/component-binding-blowback-e/Two.svelte b/test/runtime/samples/component-binding-blowback-e/Two.svelte
index 9bc34c321f..a622f559e2 100644
--- a/test/runtime/samples/component-binding-blowback-e/Two.svelte
+++ b/test/runtime/samples/component-binding-blowback-e/Two.svelte
@@ -1,3 +1,4 @@
 <script>
-	export let value = { x: true };
+	export let i, j;
+	export let value = { i, j };
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-e/_config.js b/test/runtime/samples/component-binding-blowback-e/_config.js
index 37f687a4f6..1c0e6aa0e1 100644
--- a/test/runtime/samples/component-binding-blowback-e/_config.js
+++ b/test/runtime/samples/component-binding-blowback-e/_config.js
@@ -3,7 +3,7 @@ export default {
 		<button>click me</button>
 		<button>click me</button>
 
-		<p>{"value":{"x":true}}</p>
+		<p>{"value":{"i":0,"j":0}}</p>
 		<p></p>
 	`,
 
@@ -16,8 +16,8 @@ export default {
 			<button>click me</button>
 			<button>click me</button>
 
-			<p>{"value":{"x":true}}</p>
-			<p>{"value":{"x":true}}</p>
+			<p>{"value":{"i":0,"j":0}}</p>
+			<p>{"value":{"i":1,"j":0}}</p>
 		`);
 	}
 };
diff --git a/test/runtime/samples/component-binding-blowback-e/main.svelte b/test/runtime/samples/component-binding-blowback-e/main.svelte
index 5690b33813..d6e9412618 100644
--- a/test/runtime/samples/component-binding-blowback-e/main.svelte
+++ b/test/runtime/samples/component-binding-blowback-e/main.svelte
@@ -7,8 +7,8 @@
 	};
 </script>
 
-<One bind:list={obj.a}/>
-<One bind:list={obj.b}/>
+<One bind:list={obj.a} i={0}/>
+<One bind:list={obj.b} i={1}/>
 
 <p>{obj.a.map(JSON.stringify)}</p>
 <p>{obj.b.map(JSON.stringify)}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-f/One.svelte b/test/runtime/samples/component-binding-blowback-f/One.svelte
index e2e86b1bf7..f86da72ff2 100644
--- a/test/runtime/samples/component-binding-blowback-f/One.svelte
+++ b/test/runtime/samples/component-binding-blowback-f/One.svelte
@@ -2,14 +2,15 @@
 	import Two from './Two.svelte';
 
 	export let list;
+	export let i;
 
 	function handle_click() {
 		list = [...list, {}];
 	}
 </script>
 
-{#each list as item}
-	<Two bind:value={item.value}/>
+{#each list as item, j}
+	<Two bind:value={item.value} {i} {j}/>
 {/each}
 
 <button on:click={handle_click}>
diff --git a/test/runtime/samples/component-binding-blowback-f/Two.svelte b/test/runtime/samples/component-binding-blowback-f/Two.svelte
index 28d3ae830f..94caa7878d 100644
--- a/test/runtime/samples/component-binding-blowback-f/Two.svelte
+++ b/test/runtime/samples/component-binding-blowback-f/Two.svelte
@@ -1,9 +1,10 @@
 <script>
 	import { onMount } from 'svelte';
 
+	export let i, j;
 	export let value;
 
 	onMount(() => {
-		value = { x: true };
+		value = { i, j };
 	});
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-blowback-f/_config.js b/test/runtime/samples/component-binding-blowback-f/_config.js
index d73f3e3943..46f6b379f6 100644
--- a/test/runtime/samples/component-binding-blowback-f/_config.js
+++ b/test/runtime/samples/component-binding-blowback-f/_config.js
@@ -1,11 +1,17 @@
 export default {
-	skip: 1,
-
 	html: `
 		<button>click me</button>
 		<button>click me</button>
 
-		<p>{"value":{"x":true}}</p>
+		<p>{"value":{"i":0,"j":0}}</p>
+		<p></p>
+	`,
+
+	ssrHtml: `
+		<button>click me</button>
+		<button>click me</button>
+
+		<p>{}</p>
 		<p></p>
 	`,
 
@@ -18,8 +24,8 @@ export default {
 			<button>click me</button>
 			<button>click me</button>
 
-			<p>{"value":{"x":true}}</p>
-			<p>{"value":{"x":true}}</p>
+			<p>{"value":{"i":0,"j":0}}</p>
+			<p>{"value":{"i":1,"j":0}}</p>
 		`);
 	}
 };
diff --git a/test/runtime/samples/component-binding-blowback-f/main.svelte b/test/runtime/samples/component-binding-blowback-f/main.svelte
index 5690b33813..d6e9412618 100644
--- a/test/runtime/samples/component-binding-blowback-f/main.svelte
+++ b/test/runtime/samples/component-binding-blowback-f/main.svelte
@@ -7,8 +7,8 @@
 	};
 </script>
 
-<One bind:list={obj.a}/>
-<One bind:list={obj.b}/>
+<One bind:list={obj.a} i={0}/>
+<One bind:list={obj.b} i={1}/>
 
 <p>{obj.a.map(JSON.stringify)}</p>
 <p>{obj.b.map(JSON.stringify)}</p>
\ No newline at end of file