diff --git a/templates/App.html b/templates/App.html
index 16bf42d..ed4e3c1 100644
--- a/templates/App.html
+++ b/templates/App.html
@@ -1,13 +1,12 @@
 <script>
 	import { setContext } from 'svelte';
-	import { writable } from 'svelte/store';
 	import { CONTEXT_KEY } from './internal';
 
 	export let Root;
 	export let props;
 	export let session;
 
-	setContext(CONTEXT_KEY, writable(session));
+	setContext(CONTEXT_KEY, session);
 </script>
 
 <Root {...props}/>
\ No newline at end of file
diff --git a/templates/src/server/middleware/get_page_handler.ts b/templates/src/server/middleware/get_page_handler.ts
index c695180..a60171d 100644
--- a/templates/src/server/middleware/get_page_handler.ts
+++ b/templates/src/server/middleware/get_page_handler.ts
@@ -1,3 +1,4 @@
+import { writable } from 'svelte/store.mjs';
 import fs from 'fs';
 import path from 'path';
 import cookie from 'cookie';
@@ -162,7 +163,7 @@ export function get_page_handler(
 							path: req.path,
 							query: req.query,
 							params
-						})
+						}, session)
 						: {};
 				}))
 			}
@@ -231,7 +232,7 @@ export function get_page_handler(
 			const { html, head, css } = App.render({
 				Root: manifest.root,
 				props: props,
-				session
+				session: writable(session)
 			});
 
 			const serialized = {