diff --git a/src/app.ts b/src/app.ts
index 3af02fe..1456729 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -408,12 +408,20 @@ async function processQueue(streamingState: StreamingState, res: Response, reque
   while (streamingState.queue.length > 0) {
     const current = streamingState.queue[0];
 
+    // Clear any previous state
+    streamingState.remainingContent = '';  // Add this line
+
     // Reset streaming state for new content
     streamingState.currentlyStreaming = true;
     streamingState.remainingContent = current.content;
     streamingState.isEmitting = true;
 
     try {
+      // Add a check to prevent duplicate streaming
+      if (streamingState.currentGenerator) {
+        streamingState.currentGenerator = null;  // Add this line
+      }
+
       for await (const word of streamTextNaturally(current.content, streamingState)) {
         const chunk: ChatCompletionChunk = {
           id: requestId,
@@ -429,27 +437,7 @@ async function processQueue(streamingState: StreamingState, res: Response, reque
           }]
         };
         res.write(`data: ${JSON.stringify(chunk)}\n\n`);
-
-        // Small delay between words
-        await new Promise(resolve => setTimeout(resolve, 30));
       }
-
-      // Add newline after content
-      const newlineChunk: ChatCompletionChunk = {
-        id: requestId,
-        object: 'chat.completion.chunk',
-        created,
-        model,
-        system_fingerprint: 'fp_' + requestId,
-        choices: [{
-          index: 0,
-          delta: {content: '\n'},
-          logprobs: null,
-          finish_reason: null
-        }]
-      };
-      res.write(`data: ${JSON.stringify(newlineChunk)}\n\n`);
-
     } catch (error) {
       console.error('Error in streaming:', error);
     } finally {
@@ -459,15 +447,11 @@ async function processQueue(streamingState: StreamingState, res: Response, reque
       streamingState.remainingContent = '';
       streamingState.queue.shift();
       current.resolve();
-
-      // Small delay between queue items
-      await new Promise(resolve => setTimeout(resolve, 50));
     }
   }
 
   streamingState.processingQueue = false;
 }
-
 app.post('/v1/chat/completions', (async (req: Request, res: Response) => {
   // Check authentication only if secret is set
   if (secret) {
@@ -551,10 +535,9 @@ app.post('/v1/chat/completions', (async (req: Request, res: Response) => {
     const actionListener = async (step: StepAction) => {
       // Add content to queue for both thinking steps and final answer
       if (step.think) {
-        const content = step.think;
+        // if not ends with a space, add one
+        const content = step.think + ' ';
         await new Promise<void>(resolve => {
-          streamingState.currentlyStreaming = false;
-
           streamingState.queue.push({
             content,
             resolve