diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
index b4dd6aa..324f2ad 100644
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -23,6 +23,7 @@ class JobsController < ApplicationController
 
     respond_to do |format|
       if @job.save
+        Turbo::StreamsChannel.broadcast_prepend_later_to 'jobs', target: :jobs, partial: 'jobs/job_tr', locals: {job: @job}
         format.html { redirect_to jobs_url, notice: 'Job was successfully created.' }
         format.json { render :show, status: :created, location: @job }
       else
@@ -36,6 +37,7 @@ class JobsController < ApplicationController
   def update
     respond_to do |format|
       if @job.update(job_params)
+        broadcast_update_job
         format.html { redirect_to jobs_url, notice: 'Job was successfully updated.' }
         format.json { render :show, status: :ok, location: @job }
       else
@@ -50,6 +52,7 @@ class JobsController < ApplicationController
     @job.destroy!
 
     respond_to do |format|
+      Turbo::StreamsChannel.broadcast_remove_to 'jobs', target: @job
       format.html { redirect_to jobs_url, notice: 'Job was successfully destroyed.' }
       format.json { head :no_content }
     end
@@ -59,7 +62,8 @@ class JobsController < ApplicationController
     @job.canceled! if @job.able_to_cancel?
 
     respond_to do |format|
-      format.turbo_stream {} # view is updated from model broadcast
+      broadcast_update_job
+      format.turbo_stream {} # prevent redirect_tos
       format.html { redirect_to jobs_url, notice: 'Job was successfully canceled.' }
       format.json { head :no_content }
     end
@@ -72,6 +76,10 @@ class JobsController < ApplicationController
     @job = Job.find(params[:id])
   end
 
+  def broadcast_update_job
+    Turbo::StreamsChannel.broadcast_replace_later_to 'jobs', target: @job, partial: 'jobs/job_tr', locals: {job: @job}
+  end
+
   # Only allow a list of trusted parameters through.
   def job_params
     params.require(:job).permit(:operator_id, :costumer_id, :operator_firstname, :operator_lastname,
diff --git a/app/models/job.rb b/app/models/job.rb
index eba873a..6bf24b7 100644
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -11,9 +11,6 @@ class Job < ApplicationRecord
   before_save :update_paid_at, if: :will_save_change_to_status?
   before_save :update_status_changed_at, if: :will_save_change_to_status?
 
-  after_create_commit -> { broadcast_prepend_later_to 'jobs', partial: 'jobs/job_tr' }
-  after_update_commit -> { broadcast_replace_later_to 'jobs', partial: 'jobs/job_tr' }
-
   # NOTE: Multiple status if paing before brinting?
   enum status: {
     open: 0,