diff --git a/SqlDatabaseVectorSearch/Models/Response.cs b/SqlDatabaseVectorSearch/Models/Response.cs
index 427d94e..b2e5c5e 100644
--- a/SqlDatabaseVectorSearch/Models/Response.cs
+++ b/SqlDatabaseVectorSearch/Models/Response.cs
@@ -1,3 +1,10 @@
 namespace SqlDatabaseVectorSearch.Models;
 
-public record class Response(string Question, string Answer);
+public record class Response(string Question, string Answer, StreamState? StreamState = null);
+
+public enum StreamState
+{
+    Start,
+    Append,
+    End
+}
\ No newline at end of file
diff --git a/SqlDatabaseVectorSearch/Services/ChatService.cs b/SqlDatabaseVectorSearch/Services/ChatService.cs
index 4a109dc..ba1bee6 100644
--- a/SqlDatabaseVectorSearch/Services/ChatService.cs
+++ b/SqlDatabaseVectorSearch/Services/ChatService.cs
@@ -35,6 +35,42 @@ public class ChatService(IChatCompletionService chatCompletionService, Tokenizer
     }
 
     public async Task<string> AskQuestionAsync(Guid conversationId, IEnumerable<string> chunks, string question)
+    {
+        var chat = CreateChatAsync(chunks, question);
+
+        var answer = await chatCompletionService.GetChatMessageContentAsync(chat, new AzureOpenAIPromptExecutionSettings
+        {
+            MaxTokens = appSettings.MaxOutputTokens
+        });
+
+        // Add question and answer to the chat history.
+        await SetChatHistoryAsync(conversationId, question, answer.Content!);
+
+        return answer.Content!;
+    }
+
+    public async IAsyncEnumerable<string> AskStreamingAsync(Guid conversationId, IEnumerable<string> chunks, string question)
+    {
+        var chat = CreateChatAsync(chunks, question);
+
+        var answer = new StringBuilder();
+        await foreach (var token in chatCompletionService.GetStreamingChatMessageContentsAsync(chat, new AzureOpenAIPromptExecutionSettings
+        {
+            MaxTokens = appSettings.MaxOutputTokens
+        }))
+        {
+            if (!string.IsNullOrEmpty(token.Content))
+            {
+                yield return token.Content;
+                answer.Append(token.Content);
+            }
+        }
+
+        // Add question and answer to the chat history.
+        await SetChatHistoryAsync(conversationId, question, answer.ToString());
+    }
+
+    private ChatHistory CreateChatAsync(IEnumerable<string> chunks, string question)
     {
         var chat = new ChatHistory("""
             You can use only the information provided in this chat to answer questions. If you don't know the answer, reply suggesting to refine the question.
@@ -79,16 +115,7 @@ public class ChatService(IChatCompletionService chatCompletionService, Tokenizer
         }
 
         chat.AddUserMessage(prompt.ToString());
-
-        var answer = await chatCompletionService.GetChatMessageContentAsync(chat, new AzureOpenAIPromptExecutionSettings
-        {
-            MaxTokens = appSettings.MaxOutputTokens
-        });
-
-        // Add question and answer to the chat history.
-        await SetChatHistoryAsync(conversationId, question, answer.Content!);
-
-        return answer.Content!;
+        return chat;
     }
 
     private async Task UpdateCacheAsync(Guid conversationId, ChatHistory chat)
diff --git a/SqlDatabaseVectorSearch/Services/VectorSearchService.cs b/SqlDatabaseVectorSearch/Services/VectorSearchService.cs
index 1417ce0..53ce117 100644
--- a/SqlDatabaseVectorSearch/Services/VectorSearchService.cs
+++ b/SqlDatabaseVectorSearch/Services/VectorSearchService.cs
@@ -81,6 +81,14 @@ public class VectorSearchService(ApplicationDbContext dbContext, ITextEmbeddingG
             => dbContext.Documents.Where(d => d.Id == documentId).ExecuteDeleteAsync();
 
     public async Task<Response> AskQuestionAsync(Question question, bool reformulate = true)
+    {
+        var (reformulatedQuestion, chunks) = await CreateContextAsync(question, reformulate);
+
+        var answer = await chatService.AskQuestionAsync(question.ConversationId, chunks, reformulatedQuestion);
+        return new Response(reformulatedQuestion, answer);
+    }
+
+    private async Task<(string Question, IEnumerable<string> Chunks)> CreateContextAsync(Question question, bool reformulate = true)
     {
         // Reformulate the following question taking into account the context of the chat to perform keyword search and embeddings:
         var reformulatedQuestion = reformulate ? await chatService.CreateQuestionAsync(question.ConversationId, question.Text) : question.Text;
@@ -94,8 +102,7 @@ public class VectorSearchService(ApplicationDbContext dbContext, ITextEmbeddingG
                     .Take(appSettings.MaxRelevantChunks)
                     .ToListAsync();
 
-        var answer = await chatService.AskQuestionAsync(question.ConversationId, chunks, reformulatedQuestion);
-        return new Response(reformulatedQuestion, answer);
+        return (reformulatedQuestion, chunks);
     }
 
     private static Task<string> GetContentAsync(Stream stream)