diff --git a/documentation/docs/98-reference/.generated/client-errors.md b/documentation/docs/98-reference/.generated/client-errors.md
index 7fccac5808..2ab442afc3 100644
--- a/documentation/docs/98-reference/.generated/client-errors.md
+++ b/documentation/docs/98-reference/.generated/client-errors.md
@@ -88,6 +88,10 @@ Effect cannot be created inside a `$derived` value that was not itself created i
 `%rune%` can only be used inside an effect (e.g. during component initialisation)
 ```
 
+Effects can only be created while a parent effect is running. This means that they cannot, for example, be created inside an event handler or after an `await` expression (unless the `await` occurs directly inside a component's `<script>` tag, and not inside an async function).
+
+In very rare cases, it is appropriate to use [`$effect.root`]($effect#$effect.root) so that you can create effects outside the normal component lifecycle.
+
 ### effect_pending_outside_reaction
 
 ```
diff --git a/packages/svelte/messages/client-errors/errors.md b/packages/svelte/messages/client-errors/errors.md
index 3f20cb989d..3b00d1516b 100644
--- a/packages/svelte/messages/client-errors/errors.md
+++ b/packages/svelte/messages/client-errors/errors.md
@@ -60,6 +60,10 @@ The key expression in a keyed each block must return the same value when called
 
 > `%rune%` can only be used inside an effect (e.g. during component initialisation)
 
+Effects can only be created while a parent effect is running. This means that they cannot, for example, be created inside an event handler or after an `await` expression (unless the `await` occurs directly inside a component's `<script>` tag, and not inside an async function).
+
+In very rare cases, it is appropriate to use [`$effect.root`]($effect#$effect.root) so that you can create effects outside the normal component lifecycle.
+
 ## effect_pending_outside_reaction
 
 > `$effect.pending()` can only be called inside an effect or derived
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
index 545bc3be27..5a54d62471 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
@@ -115,8 +115,7 @@ function is_last_evaluated_expression(path, node) {
 				break;
 
 			case 'MemberExpression':
-				if (parent.computed && node === parent.object) return false;
-				break;
+				return false;
 
 			case 'ObjectExpression':
 				if (node !== parent.properties.at(-1)) return false;
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
index 8b4891da8e..72685a8e83 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
@@ -194,11 +194,6 @@ export function VariableDeclaration(node, context) {
 					/** @type {CallExpression} */ (init)
 				);
 
-				// for now, only wrap async derived in $.save if it's not
-				// a top-level instance derived. TODO in future maybe we
-				// can dewaterfall all of them?
-				const should_save = context.state.is_instance && context.state.scope.function_depth > 1;
-
 				if (declarator.id.type === 'Identifier') {
 					let expression = /** @type {Expression} */ (context.visit(value));
 
@@ -213,9 +208,7 @@ export function VariableDeclaration(node, context) {
 							location ? b.literal(location) : undefined
 						);
 
-						call = should_save ? save(call, true) : b.await(call);
-
-						declarations.push(b.declarator(declarator.id, call));
+						declarations.push(b.declarator(declarator.id, b.await(call)));
 					} else {
 						if (rune === '$derived') expression = b.thunk(expression);
 
@@ -251,7 +244,7 @@ export function VariableDeclaration(node, context) {
 								location ? b.literal(location) : undefined
 							);
 
-							call = should_save ? save(call, true) : b.await(call);
+							call = b.await(call);
 						}
 
 						declarations.push(b.declarator(id, call));
diff --git a/packages/svelte/src/compiler/utils/ast.js b/packages/svelte/src/compiler/utils/ast.js
index 8d6df28f31..75aadd905b 100644
--- a/packages/svelte/src/compiler/utils/ast.js
+++ b/packages/svelte/src/compiler/utils/ast.js
@@ -633,8 +633,7 @@ export function has_await_expression(node) {
 /**
  * Turns `await ...` to `(await $.save(...))()`
  * @param {ESTree.Expression} expression
- * @param {boolean} unset
  */
-export function save(expression, unset = false) {
-	return b.call(b.await(b.call('$.save', expression, unset && b.true)));
+export function save(expression) {
+	return b.call(b.await(b.call('$.save', expression)));
 }
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 10cdb40c57..89115108d5 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -25,7 +25,6 @@ import {
 	set_reactivity_loss_tracker
 } from './deriveds.js';
 import { aborted } from './effects.js';
-import { queue_micro_task } from '../dom/task.js';
 
 /**
  * @param {Blocker[]} blockers
@@ -149,25 +148,13 @@ export function capture() {
  * `await a + b` becomes `(await $.save(a))() + b`
  * @template T
  * @param {Promise<T>} promise
- * @param {boolean} unset
  * @returns {Promise<() => T>}
  */
-export async function save(promise, unset) {
-	var batch = current_batch;
+export async function save(promise) {
 	var restore = capture();
 	var value = await promise;
 
 	return () => {
-		if (unset) {
-			// If this is happening outside the context of an async derived,
-			// context will not automatically be unset
-			queue_micro_task(() => {
-				if (batch === current_batch) {
-					unset_context();
-				}
-			});
-		}
-
 		restore();
 		return value;
 	};
diff --git a/packages/svelte/tests/runtime-runes/samples/async-disconnected-effect-root/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-disconnected-effect-root/main.svelte
index 3b42acf171..0ddb7d01d7 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-disconnected-effect-root/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-disconnected-effect-root/main.svelte
@@ -6,14 +6,13 @@
 			async function fn() {
 				let count = $state(1);
 				increment = () => { count++; };
+				$effect.pre(() => console.log(count))
 				const value = $derived(await count);
-				$effect.pre(() => console.log(value))
 				return { get value() { return value } };
 			}
 			fn().then(r => console.log(r.value));
 		})
 	})
-
 </script>
 
 <button onclick={() => increment()}>increment</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-orphan/_config.js b/packages/svelte/tests/runtime-runes/samples/async-effect-orphan/_config.js
new file mode 100644
index 0000000000..b76ea85bfd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-orphan/_config.js
@@ -0,0 +1,12 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, logs }) {
+		await tick();
+
+		assert.deepEqual(logs, [
+			`effect_orphan\n\`$effect\` can only be used inside an effect (e.g. during component initialisation)\nhttps://svelte.dev/e/effect_orphan`
+		]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-orphan/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-effect-orphan/main.svelte
new file mode 100644
index 0000000000..086a048025
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-orphan/main.svelte
@@ -0,0 +1,14 @@
+<script>
+	async function foo() {
+		await 0;
+		$effect(() => {
+			console.log('this effect is orphaned');
+		});
+	}
+
+	try {
+		await foo();
+	} catch (e) {
+		console.log(e.message)
+	}
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-unset-context-after-restore/_config.js b/packages/svelte/tests/runtime-runes/samples/async-unset-context-after-restore/_config.js
deleted file mode 100644
index ad543e91ae..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/async-unset-context-after-restore/_config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { tick } from 'svelte';
-import { test } from '../../test';
-
-export default test({
-	async test({ assert, logs }) {
-		await new Promise((resolve) => setTimeout(resolve, 10));
-		assert.deepEqual(logs, [1, 1]);
-		const [button] = document.querySelectorAll('button');
-
-		button.click();
-		await tick();
-		assert.deepEqual(logs, [1, 1, 2]);
-	}
-});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-unset-context-after-restore/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-unset-context-after-restore/main.svelte
deleted file mode 100644
index a39c75fb94..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/async-unset-context-after-restore/main.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-	let increment;
-
-	async function fn() {
-		let count = $state(1);
-		increment = () => { count++; };
-		const value = $derived(await count);
-		$effect.pre(() => console.log(value))
-		return { get value() { return value } };
-	}
-	fn().then(r => console.log(r.value));
-
-</script>
-
-<button onclick={() => increment()}>increment</button>