diff --git a/packages/interactivity/src/store.ts b/packages/interactivity/src/store.ts
index 10a449e9b77a47..055e6e3cc99ff4 100644
--- a/packages/interactivity/src/store.ts
+++ b/packages/interactivity/src/store.ts
@@ -117,8 +117,16 @@ const handlers = {
 					setScope( scope );
 					try {
 						it = gen.next( value );
+					} finally {
+						resetScope();
+						resetNamespace();
+					}
+
+					try {
 						value = await it.value;
 					} catch ( e ) {
+						setNamespace( ns );
+						setScope( scope );
 						gen.throw( e );
 					} finally {
 						resetScope();