diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb
index a784c5bd9..5ad38435d 100644
--- a/app/controllers/admin/poll/booth_assignments_controller.rb
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -1,5 +1,5 @@
 class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController
-  before_action :load_poll, except: [:create, :destroy]
+  before_action :load_poll, except: [:create]
 
   def index
     @booth_assignments = @poll.booth_assignments.includes(:booth).order("poll_booths.name")
@@ -36,9 +36,8 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController
   end
 
   def destroy
-    @poll = Poll.find(booth_assignment_params[:poll_id])
-    @booth = Poll::Booth.find(booth_assignment_params[:booth_id])
-    @booth_assignment = ::Poll::BoothAssignment.find(params[:id])
+    @booth_assignment = @poll.booth_assignments.find(params[:id])
+    @booth = @booth_assignment.booth
 
     @booth_assignment.destroy!
 
diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
index 13857144a..8f159a264 100644
--- a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
+++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
@@ -12,7 +12,7 @@
   </td>
   <td>
     <%= link_to t("admin.booth_assignments.manage.actions.unassign"),
-                admin_poll_booth_assignment_path(@poll, booth_assignment, booth_id: booth.id),
+                admin_poll_booth_assignment_path(@poll, booth_assignment),
                 method: :delete,
                 remote: true,
                 title: t("admin.booth_assignments.manage.actions.unassign"),