diff --git a/app/(playground)/p/[agentId]/beta-proto/graph/server-actions.ts b/app/(playground)/p/[agentId]/beta-proto/graph/server-actions.ts
index bcd1b284..534b8db9 100644
--- a/app/(playground)/p/[agentId]/beta-proto/graph/server-actions.ts
+++ b/app/(playground)/p/[agentId]/beta-proto/graph/server-actions.ts
@@ -27,7 +27,7 @@ const flushMetricsAndShutdown = async (lf: Langfuse, metricReader: any) => {
 			reject(new Error("Metric flush timeout after 20 seconds"));
 		}, 20000);
 
-                console.log("inside waitUntil()-----")
+		console.log("inside waitUntil()-----");
 		Promise.all([metricReader.forceFlush(), lf.shutdownAsync()])
 			.then(() => {
 				clearTimeout(timeoutId);
@@ -54,7 +54,7 @@ export async function generateArtifactStream(
 	});
 	const stream = createStreamableValue();
 
-	(async () => {
+	const processStream = async () => {
 		const model = "gpt-4o-mini";
 		const generation = trace.generation({
 			input: params.userPrompt,
@@ -76,23 +76,6 @@ export async function generateArtifactStream(
 					subscriptionId,
 					isR06User,
 				});
-                          console.log("before waitUntil()-----")
-				waitUntil(
-					flushMetricsAndShutdown(lf, metricReader).catch((error) => {
-						if (error.message === "Metric flush timeout after 20 seconds") {
-							console.error(
-								"Metric flush and Langfuse shutdown timed out:",
-								error,
-							);
-						} else {
-							console.error(
-								"Error during metric flush and Langfuse shutdown:",
-								error,
-							);
-						}
-					}),
-				);
-                          console.log("after waitUntil()-----")
 				generation.end({
 					output: result,
 				});
@@ -106,9 +89,24 @@ export async function generateArtifactStream(
 		const result = await object;
 
 		stream.done();
-	})();
-
-        console.log("before return-----")
+	};
+
+	await processStream();
+
+	console.log("before waitUntil()-----");
+	waitUntil(
+		flushMetricsAndShutdown(lf, metricReader).catch((error) => {
+			if (error.message === "Metric flush timeout after 20 seconds") {
+				console.error("Metric flush and Langfuse shutdown timed out:", error);
+			} else {
+				console.error(
+					"Error during metric flush and Langfuse shutdown:",
+					error,
+				);
+			}
+		}),
+	);
+	console.log("returning");
 
 	return { object: stream.value };
 }