diff --git a/app/models/product_build_list.rb b/app/models/product_build_list.rb
index cef83edae..01a91bc60 100644
--- a/app/models/product_build_list.rb
+++ b/app/models/product_build_list.rb
@@ -83,7 +83,7 @@ class ProductBuildList < ActiveRecord::Base
     end
 
     event :build_success do
-      transition :build_started => :build_completed
+      transition [:build_started, :build_canceling] => :build_completed
     end
 
     event :build_error do
diff --git a/lib/abf_worker/iso_worker_observer.rb b/lib/abf_worker/iso_worker_observer.rb
index 70ce04cad..b091149d7 100644
--- a/lib/abf_worker/iso_worker_observer.rb
+++ b/lib/abf_worker/iso_worker_observer.rb
@@ -15,7 +15,6 @@ module AbfWorker
       when CANCELED
         pbl.build_canceled
       end
-      pbl.build_canceled if pbl.build_canceling?
       if status != STARTED
         update_results(pbl, options)
       end