diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 2e71f7340..95fcee95e 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -345,7 +345,7 @@ class MessagesController < ApplicationController
       elsif @message.parent
         redirect_to board_message_url(@board, @message.parent, :r => r)
       else
-        redirect_to course_boards_path(@course)
+        redirect_to course_boards_path(@course, :board_id => @board.id)
       end
     elsif @contest
       if params[:is_course] && params[:is_course].to_i == 0
@@ -357,7 +357,7 @@ class MessagesController < ApplicationController
       elsif @message.parent
         redirect_to board_message_url(@board, @message.parent, :r => r)
       else
-        redirect_to contest_boards_path(@contest)
+        redirect_to contest_boards_path(@contest, :board_id => @board.id)
       end
     elsif @org_subfield
       if params[:is_board]