diff --git a/assets/javascripts/discourse/components/modal/diff-modal.gjs b/assets/javascripts/discourse/components/modal/diff-modal.gjs
index 68d16f5a..4e1b7cf0 100644
--- a/assets/javascripts/discourse/components/modal/diff-modal.gjs
+++ b/assets/javascripts/discourse/components/modal/diff-modal.gjs
@@ -23,6 +23,7 @@ export default class ModalDiffModal extends Component {
 
   @tracked loading = false;
   @tracked finalResult = "";
+  @tracked showcasedDiff = "";
   @tracked diffStreamer = new DiffStreamer(this.args.model.selectedText);
   @tracked suggestion = "";
   @tracked
@@ -30,16 +31,13 @@ export default class ModalDiffModal extends Component {
     () => this.suggestion,
     (newValue) => (this.suggestion = newValue)
   );
+  @tracked isStreaming = false;
 
   constructor() {
     super(...arguments);
     this.suggestChanges();
   }
 
-  get isStreaming() {
-    return this.diffStreamer.isStreaming || this.smoothStreamer.isStreaming;
-  }
-
   get primaryBtnLabel() {
     return this.loading
       ? i18n("discourse_ai.ai_helper.context_menu.loading")
@@ -64,12 +62,25 @@ export default class ModalDiffModal extends Component {
 
   @action
   async updateResult(result) {
+    // TODO(@keegan)
+    // Temporarily we are removing the animation using the diff streamer
+    // and simply showing the diff streamed without a proper animation
+    // while we figure things out
+    // so that things are not too janky in the meantime.
     this.loading = false;
+    this.isStreaming = true;
 
     if (result.done) {
       this.finalResult = result.result;
     }
 
+    this.showcasedDiff = result.diff;
+
+    if (result.done) {
+      this.loading = false;
+      this.isStreaming = false;
+    }
+
     if (this.args.model.showResultAsDiff) {
       this.diffStreamer.updateResult(result, "result");
     } else {
@@ -140,12 +151,11 @@ export default class ModalDiffModal extends Component {
                 "composer-ai-helper-modal__suggestion"
                 "streamable-content"
                 (if this.isStreaming "streaming")
-                (if this.diffStreamer.isThinking "thinking")
                 (if @model.showResultAsDiff "inline-diff")
               }}
             >
               {{#if @model.showResultAsDiff}}
-                {{htmlSafe this.diffStreamer.diff}}
+                {{htmlSafe this.showcasedDiff}}
               {{else}}
                 {{#if this.smoothStreamer.isStreaming}}
                   <CookText
diff --git a/lib/ai_helper/assistant.rb b/lib/ai_helper/assistant.rb
index 95fd5ab7..c9d4691e 100644
--- a/lib/ai_helper/assistant.rb
+++ b/lib/ai_helper/assistant.rb
@@ -185,11 +185,9 @@ module DiscourseAi
           if (streamed_result.length > 10 && (Time.now - start > 0.3)) || Rails.env.test?
             sanitized = sanitize_result(streamed_result)
 
-            if DiscourseAi::Utils::DiffUtils::SafetyChecker.safe_to_stream?(sanitized)
-              payload = { result: sanitized, diff: streamed_diff, done: false }
-              publish_update(channel, payload, user)
-              start = Time.now
-            end
+            payload = { result: sanitized, diff: streamed_diff, done: false }
+            publish_update(channel, payload, user)
+            start = Time.now
           end
         end