diff --git a/lib/travis/api/app/endpoint/builds.rb b/lib/travis/api/app/endpoint/builds.rb
index 8ee7ee71..68df723f 100644
--- a/lib/travis/api/app/endpoint/builds.rb
+++ b/lib/travis/api/app/endpoint/builds.rb
@@ -23,7 +23,7 @@ class Travis::Api::App
         Metriks.meter("api.request.cancel_build").mark
 
         if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
-          service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id] })
+          service = Travis::Enqueue::Services::CancelModel.new(current_user, { id: params[:id], type: :build })
         else
           service = self.service(:cancel_build, params.merge(source: 'api'))
         end
diff --git a/lib/travis/api/app/endpoint/jobs.rb b/lib/travis/api/app/endpoint/jobs.rb
index aa8b9f76..cd5cc300 100644
--- a/lib/travis/api/app/endpoint/jobs.rb
+++ b/lib/travis/api/app/endpoint/jobs.rb
@@ -30,7 +30,7 @@ class Travis::Api::App
         Metriks.meter("api.request.cancel_job").mark
 
         if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
-          service = Travis::Enqueue::Services::CancelModel.new(current_user, { job_id: params[:id] })
+          service = Travis::Enqueue::Services::CancelModel.new(current_user, { id: params[:id], type: :job })
         else
           service = self.service(:cancel_job, params.merge(source: 'api'))
         end
diff --git a/lib/travis/api/enqueue/services/cancel_model.rb b/lib/travis/api/enqueue/services/cancel_model.rb
index 152187d1..1b2e722c 100644
--- a/lib/travis/api/enqueue/services/cancel_model.rb
+++ b/lib/travis/api/enqueue/services/cancel_model.rb
@@ -32,14 +32,14 @@ module Travis
         end
 
         def type
-          @type ||= @params[:build_id] ? :build : :job
+          @params[:type]
         end
 
         def target
           if type == :build
-            @target = Build.find(@params[:build_id])
+            @target = Build.find(@params[:id])
           else
-            @target = Job.find(@params[:job_id])
+            @target = Job.find(@params[:id])
           end
         end