diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
index a8492fac20..bd07a0e8ae 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
@@ -2450,7 +2450,7 @@ export const template_visitors = {
 
 		node.context.elements.forEach((element, i) => {
 			if (!element) return;
-			const id = element.type === 'Identifier' ? element : b.id(`$$context${i}`);
+			const id = element.type === 'Identifier' ? element : b.id(`$$arg${i}`);
 			args.push(id);
 
 			if (element.type === 'Identifier') {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index c8530a87dd..584e6e379f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -1437,9 +1437,9 @@ const template_visitors = {
 		// TODO hoist where possible
 		/** @type {import('estree').Pattern[]} */
 		const args = [b.id('$$payload')];
-		if (node.context) {
-			args.push(node.context);
-		}
+		node.context.elements.forEach((arg) => {
+			if (arg) args.push(arg);
+		});
 
 		context.state.init.push(
 			b.function_declaration(