diff --git a/.changeset/new-candles-marry.md b/.changeset/new-candles-marry.md
new file mode 100644
index 0000000000..4d55980c72
--- /dev/null
+++ b/.changeset/new-candles-marry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: simplify internal component `pop()`
diff --git a/packages/svelte/src/internal/client/context.js b/packages/svelte/src/internal/client/context.js
index 9f948de18f..ed4a4b2390 100644
--- a/packages/svelte/src/internal/client/context.js
+++ b/packages/svelte/src/internal/client/context.js
@@ -184,7 +184,7 @@ export function pop(component) {
 	component_context = context.p;
 
 	if (DEV) {
-		dev_current_component_function = context.p?.function ?? null;
+		dev_current_component_function = component_context?.function ?? null;
 	}
 
 	return component ?? /** @type {T} */ ({});