diff --git a/packages/start/src/config/manifest.ts b/packages/start/src/config/manifest.ts
index d10d9c503..9b0a655c3 100644
--- a/packages/start/src/config/manifest.ts
+++ b/packages/start/src/config/manifest.ts
@@ -16,6 +16,8 @@ export function manifest(start: SolidStartOptions): PluginOption {
       devServer = server;
     },
     async resolveId(id) {
+      if (id.startsWith("/@manifest/")) return id;
+
       if (id === VIRTUAL_MODULES.clientViteManifest)
         return `\0${VIRTUAL_MODULES.clientViteManifest}`;
       if (id === VIRTUAL_MODULES.getClientManifest)
diff --git a/packages/start/src/directives/index.ts b/packages/start/src/directives/index.ts
index 0219fe346..3995b4bb1 100644
--- a/packages/start/src/directives/index.ts
+++ b/packages/start/src/directives/index.ts
@@ -181,15 +181,10 @@ export function serverFunctionsPlugin(options: ServerFunctionsOptions): Plugin[]
         }
         return null;
       },
-      async load(id, opts) {
+      load(id, opts) {
         const mode = opts?.ssr ? "server" : "client";
         if (id === options.manifest) {
-          const current = new Debouncer(() =>
-            [...manifest[mode]].map(entry => `import "${entry}";`).join("\n"),
-          );
-          preload[mode] = current;
-          const result = await current.promise.reference;
-          return result;
+          return [...manifest[mode]].map(entry => `import "${entry}";`).join("\n");
         }
         return null;
       },
diff --git a/packages/start/src/server/handler.ts b/packages/start/src/server/handler.ts
index 9b1c9f218..ac24e8bfc 100644
--- a/packages/start/src/server/handler.ts
+++ b/packages/start/src/server/handler.ts
@@ -114,12 +114,12 @@ export function createBaseHandler(
 
       if (mode === "async") return await stream;
 
-      delete (stream as any).then;
-
       // using TransformStream in dev can cause solid-start-dev-server to crash
       // when stream is cancelled
       if (globalThis.USING_SOLID_START_DEV_SERVER) return stream;
 
+      delete (stream as any).then;
+
       // returning stream directly breaks cloudflare workers
       const { writable, readable } = new TransformStream();
       stream.pipeTo(writable);