diff --git a/src/compile/render-dom/wrappers/AwaitBlock.ts b/src/compile/render-dom/wrappers/AwaitBlock.ts
index bfd3143333..50320ee8b6 100644
--- a/src/compile/render-dom/wrappers/AwaitBlock.ts
+++ b/src/compile/render-dom/wrappers/AwaitBlock.ts
@@ -174,6 +174,9 @@ export default class AwaitBlockWrapper extends Wrapper {
 		block.builders.mount.addBlock(deindent`
 			${info}.block.${hasTransitions ? 'i' : 'm'}(${initialMountNode}, ${info}.anchor = ${anchorNode});
 			${info}.mount = () => ${updateMountNode};
+			if (${info}.anchor == null) {
+				${info}.anchor = ${anchor};
+			}
 		`);
 
 		const conditions = [];
diff --git a/test/runtime/samples/await-then-catch-order/_config.js b/test/runtime/samples/await-then-catch-order/_config.js
new file mode 100644
index 0000000000..4a8f4df77c
--- /dev/null
+++ b/test/runtime/samples/await-then-catch-order/_config.js
@@ -0,0 +1,27 @@
+let fulfil;
+
+let thePromise = new Promise(f => {
+	fulfil = f;
+});
+
+export default {
+	data: {
+		thePromise
+	},
+
+	html: `
+		<p>loading...</p><p>true!</p>
+	`,
+
+	test(assert, component, target) {
+		fulfil(42);
+
+		return thePromise
+			.then(() => {
+				assert.htmlEqual(target.innerHTML, `
+					<p>the value is 42</p><p>true!</p>
+				`);
+			});
+
+	}
+};
diff --git a/test/runtime/samples/await-then-catch-order/main.html b/test/runtime/samples/await-then-catch-order/main.html
new file mode 100644
index 0000000000..87b37bf27d
--- /dev/null
+++ b/test/runtime/samples/await-then-catch-order/main.html
@@ -0,0 +1,11 @@
+{#await thePromise}
+	<p>loading...</p>
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
+
+{#if true}
+	<p>true!</p>
+{/if}
diff --git a/test/runtime/samples/transition-js-await-block/_config.js b/test/runtime/samples/transition-js-await-block/_config.js
index ff9888c88b..6c482afe45 100644
--- a/test/runtime/samples/transition-js-await-block/_config.js
+++ b/test/runtime/samples/transition-js-await-block/_config.js
@@ -26,10 +26,10 @@ export default {
 		return promise.then(() => {
 			raf.tick(80);
 			let ps = document.querySelectorAll('p');
-			assert.equal(ps[0].className, 'pending');
-			assert.equal(ps[1].className, 'then');
-			assert.equal(ps[0].foo, 0.2);
-			assert.equal(ps[1].foo, 0.3);
+			assert.equal(ps[1].className, 'pending');
+			assert.equal(ps[0].className, 'then');
+			assert.equal(ps[1].foo, 0.2);
+			assert.equal(ps[0].foo, 0.3);
 		});
 	}
 };