From d694c57e8ca1a23fb7e779e49dd8f927e2f65440 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 16 Sep 2025 15:02:57 -0600
Subject: [PATCH] cleanup

---
 packages/svelte/src/index-server.js          | 2 +-
 packages/svelte/src/internal/server/index.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index a1c072a1ca..4f6c2c5d3f 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -5,7 +5,7 @@ import * as e from './internal/server/errors.js';
 
 /** @param {() => void} fn */
 export function onDestroy(fn) {
-	/** @type {SSRContext} */ (ssr_context).r.on_destroy(fn);
+	/** @type {SSRContext} */ (ssr_context).r?.on_destroy(fn);
 }
 
 export {
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index b9c2339e81..84d833a22d 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -74,6 +74,7 @@ export function render(component, options = {}) {
 		if (options.context) {
 			push();
 			/** @type {SSRContext} */ (ssr_context).c = options.context;
+			/** @type {SSRContext} */ (ssr_context).r = payload;
 		}
 
 		// @ts-expect-error
@@ -98,7 +99,7 @@ export function render(component, options = {}) {
 		return {
 			head,
 			html: body,
-			body: body
+			body
 		};
 	} finally {
 		abort();
@@ -127,6 +128,7 @@ export async function render_async(component, options = {}) {
 		if (options.context) {
 			push();
 			/** @type {SSRContext} */ (ssr_context).c = options.context;
+			/** @type {SSRContext} */ (ssr_context).r = payload;
 		}
 
 		// @ts-expect-error
@@ -151,7 +153,7 @@ export async function render_async(component, options = {}) {
 		return {
 			head,
 			html: body,
-			body: body
+			body
 		};
 	} finally {
 		abort();