diff --git a/app/services/discourse_ai/base_translator.rb b/app/services/discourse_ai/base_translator.rb
index 2c3a64ee..64c292e5 100644
--- a/app/services/discourse_ai/base_translator.rb
+++ b/app/services/discourse_ai/base_translator.rb
@@ -14,15 +14,15 @@ def translate
           messages: [{ type: :user, content: formatted_content, id: "user" }],
         )
 
-      response =
+      structured_output =
         DiscourseAi::Completions::Llm.proxy(SiteSetting.ai_helper_model).generate(
           prompt,
           user: Discourse.system_user,
           feature_name: "translator-translate",
-          extra_model_params: response_format,
+          response_format: response_format,
         )
 
-      JSON.parse(response)&.dig("translation")
+      structured_output&.read_latest_buffered_chunk&.dig(:translation)
     end
 
     def formatted_content
@@ -31,22 +31,20 @@ def formatted_content
 
     def response_format
       {
-        response_format: {
-          type: "json_schema",
-          json_schema: {
-            name: "reply",
-            schema: {
-              type: "object",
-              properties: {
-                translation: {
-                  type: "string",
-                },
+        type: "json_schema",
+        json_schema: {
+          name: "reply",
+          schema: {
+            type: "object",
+            properties: {
+              translation: {
+                type: "string",
               },
-              required: ["translation"],
-              additionalProperties: false,
             },
-            strict: true,
+            required: ["translation"],
+            additionalProperties: false,
           },
+          strict: true,
         },
       }
     end
diff --git a/app/services/discourse_ai/language_detector.rb b/app/services/discourse_ai/language_detector.rb
index 74b1cab0..a16c23a2 100644
--- a/app/services/discourse_ai/language_detector.rb
+++ b/app/services/discourse_ai/language_detector.rb
@@ -49,35 +49,33 @@ def detect
           messages: [{ type: :user, content: @text, id: "user" }],
         )
 
-      response =
+      structured_output =
         DiscourseAi::Completions::Llm.proxy(SiteSetting.ai_helper_model).generate(
           prompt,
           user: Discourse.system_user,
           feature_name: "translator-language-detect",
-          extra_model_params: response_format,
+          response_format: response_format,
         )
 
-      locale = JSON.parse(response)&.dig("locale")
+      structured_output&.read_latest_buffered_chunk&.dig(:locale)
     end
 
     def response_format
       {
-        response_format: {
-          type: "json_schema",
-          json_schema: {
-            name: "reply",
-            schema: {
-              type: "object",
-              properties: {
-                locale: {
-                  type: "string",
-                },
+        type: "json_schema",
+        json_schema: {
+          name: "reply",
+          schema: {
+            type: "object",
+            properties: {
+              locale: {
+                type: "string",
               },
-              required: ["locale"],
-              additionalProperties: false,
             },
-            strict: true,
+            required: ["locale"],
+            additionalProperties: false,
           },
+          strict: true,
         },
       }
     end
diff --git a/spec/services/discourse_ai/base_translator_spec.rb b/spec/services/discourse_ai/base_translator_spec.rb
index 7f991ff8..086d5204 100644
--- a/spec/services/discourse_ai/base_translator_spec.rb
+++ b/spec/services/discourse_ai/base_translator_spec.rb
@@ -13,7 +13,7 @@
   describe ".translate" do
     let(:text_to_translate) { "cats are great" }
     let(:target_language) { "de" }
-    let(:llm_response) { "{\"translation\":\"hur dur hur dur!\"}" }
+    let(:llm_response) { "hur dur hur dur!" }
 
     it "creates the correct prompt" do
       post_translator = DiscourseAi::PostTranslator.new(text_to_translate, target_language)
@@ -32,6 +32,10 @@
       mock_llm = instance_double(DiscourseAi::Completions::Llm)
       post_translator = DiscourseAi::PostTranslator.new(text_to_translate, target_language)
 
+      structured_output =
+        DiscourseAi::Completions::StructuredOutput.new({ translation: { type: "string" } })
+      structured_output << { translation: llm_response }.to_json
+
       allow(DiscourseAi::Completions::Prompt).to receive(:new).and_return(mock_prompt)
       allow(DiscourseAi::Completions::Llm).to receive(:proxy).with(
         SiteSetting.ai_helper_model,
@@ -40,8 +44,8 @@
         mock_prompt,
         user: Discourse.system_user,
         feature_name: "translator-translate",
-        extra_model_params: post_translator.response_format,
-      ).and_return(llm_response)
+        response_format: post_translator.response_format,
+      ).and_return(structured_output)
 
       post_translator.translate
     end
diff --git a/spec/services/discourse_ai/language_detector_spec.rb b/spec/services/discourse_ai/language_detector_spec.rb
index 0fd936ac..6c5a8b01 100644
--- a/spec/services/discourse_ai/language_detector_spec.rb
+++ b/spec/services/discourse_ai/language_detector_spec.rb
@@ -12,7 +12,7 @@
 
   describe ".detect" do
     let(:locale_detector) { described_class.new("meow") }
-    let(:llm_response) { "{\"translation\":\"hur dur hur dur!\"}" }
+    let(:llm_response) { "hur dur hur dur!" }
 
     it "creates the correct prompt" do
       allow(DiscourseAi::Completions::Prompt).to receive(:new).with(
@@ -29,6 +29,10 @@
       mock_prompt = instance_double(DiscourseAi::Completions::Prompt)
       mock_llm = instance_double(DiscourseAi::Completions::Llm)
 
+      structured_output =
+        DiscourseAi::Completions::StructuredOutput.new({ locale: { type: "string" } })
+      structured_output << { locale: llm_response }.to_json
+
       allow(DiscourseAi::Completions::Prompt).to receive(:new).and_return(mock_prompt)
       allow(DiscourseAi::Completions::Llm).to receive(:proxy).with(
         SiteSetting.ai_helper_model,
@@ -37,8 +41,8 @@
         mock_prompt,
         user: Discourse.system_user,
         feature_name: "translator-language-detect",
-        extra_model_params: locale_detector.response_format,
-      ).and_return(llm_response)
+        response_format: locale_detector.response_format,
+      ).and_return(structured_output)
 
       locale_detector.detect
     end
diff --git a/spec/services/discourse_ai_spec.rb b/spec/services/discourse_ai_spec.rb
index 52796ad5..e93e1ece 100644
--- a/spec/services/discourse_ai_spec.rb
+++ b/spec/services/discourse_ai_spec.rb
@@ -28,7 +28,7 @@
   describe ".detect!" do
     it "returns the detected language" do
       locale = "de"
-      DiscourseAi::Completions::Llm.with_prepared_responses([locale_json(locale)]) do
+      DiscourseAi::Completions::Llm.with_prepared_responses([locale]) do
         expect(DiscourseTranslator::Provider::DiscourseAi.detect!(post)).to eq locale
       end
     end
@@ -41,9 +41,7 @@
     end
 
     it "translates the post and returns [locale, translated_text]" do
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        [translation_json("some translated text")],
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(["some translated text"]) do
         translated_text = DiscourseTranslator::Provider::DiscourseAi.translate_translatable!(post)
         expect(translated_text).to eq "<p>some translated text</p>"
       end
@@ -51,9 +49,7 @@
 
     it "translates the topic" do
       allow(::DiscourseAi::TopicTranslator).to receive(:new).and_call_original
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        [translation_json("some translated text")],
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(["some translated text"]) do
         translated_text = DiscourseTranslator::Provider::DiscourseAi.translate_translatable!(topic)
         expect(translated_text).to eq "some translated text"
       end
@@ -61,9 +57,7 @@
 
     it "sends the content for splitting and the split content for translation" do
       post.update(raw: "#{"a" * 3000} #{"b" * 3000}")
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        %w[lol wut].map { |content| translation_json(content) },
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(%w[lol wut]) do
         expect(
           DiscourseTranslator::Provider::DiscourseAi.translate_translatable!(post),
         ).to eq "<p>lolwut</p>"
@@ -73,20 +67,10 @@
 
   describe ".translate_text!" do
     it "returns the translated text" do
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        [translation_json("some translated text")],
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(["some translated text"]) do
         translated_text = DiscourseTranslator::Provider::DiscourseAi.translate_text!("derp")
         expect(translated_text).to eq "some translated text"
       end
     end
   end
-
-  def locale_json(content)
-    { locale: content }.to_json
-  end
-
-  def translation_json(content)
-    { translation: content }.to_json
-  end
 end