diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 9a12634cf..97b9ecc44 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -250,7 +250,7 @@ class HomeworkCommonsController < ApplicationController
         student_works = @homework.student_works.where(user_id: user_ids)
       end
 
-      myshixuns = Myshixun.where(shixun_id: params[:shixun_id], user_id: user_ids).
+      myshixuns = Myshixun.where(shixun_id: @homework.homework_commons_shixun&.shixun_id, user_id: user_ids).
           includes(:games).where(games: {challenge_id: @homework.homework_challenge_settings.pluck(:challenge_id)})
       challenge_settings = @homework.homework_challenge_settings
       myshixuns.find_each(batch_size: 100) do |myshixun|