diff --git a/packages/tools/src/openai/middleware.ts b/packages/tools/src/openai/middleware.ts
index 39425e12..15bcaeba 100644
--- a/packages/tools/src/openai/middleware.ts
+++ b/packages/tools/src/openai/middleware.ts
@@ -280,11 +280,10 @@ export function createOpenAIMiddleware(
 		const results = await Promise.all(operations)
 		const memories = results[results.length - 1] as string
 
-		const enhancedMessages = injectMemoriesIntoMessages(
-			messages,
-			memories,
-			logger,
-		)
+		// Only inject memories if we actually have some
+		const enhancedMessages = memories
+			? injectMemoriesIntoMessages(messages, memories, logger)
+			: messages
 
 		return originalCreate.call(openaiClient.chat.completions, {
 			...params,