diff --git a/src/shared/await-block.js b/src/shared/await-block.js
index 0fa5c4d403..4ef5536962 100644
--- a/src/shared/await-block.js
+++ b/src/shared/await-block.js
@@ -14,9 +14,10 @@ export function handlePromise(promise, info) {
 		if (info.block) {
 			if (info.blocks) {
 				info.blocks.forEach((block, i) => {
-					if (i !== index) block.o(() => {
+					if (i !== index && block) block.o(() => {
 						block.u();
 						block.d();
+						info.blocks[i] = null;
 					});
 				});
 			} else {