diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index de500ef..3a4caaf 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -6,7 +6,6 @@ class MessagesController < ApplicationController
 
   before_action :cors_set_access_control_headers, only: %i[ create cors_preflight_check ]
   before_action :set_contest, only: %i[ convert destroy ]
-  before_action :set_message, only: %i[ convert destroy ]
   before_action :set_data, only: %i[ convert ]
 
   def self.local_prefixes
@@ -51,6 +50,7 @@ class MessagesController < ApplicationController
   def convert
     authorize @contest
 
+    @message = Message.find(params[:message_id])
     @completion = Completion.new()
     @completion.display_time_from_start = @message.display_time
 
@@ -60,6 +60,7 @@ class MessagesController < ApplicationController
   def destroy
     authorize @contest
 
+    @message = Message.find(params[:id])
     @message.destroy
     redirect_to contest_path(@contest)
   end
@@ -70,10 +71,6 @@ class MessagesController < ApplicationController
     @contest = Contest.find(params[:contest_id])
   end
 
-  def set_message
-    @message = Message.find(params[:message_id])
-  end
-
   def set_data
     @contestants = @contest.contestants
     @puzzles = @contest.puzzles