diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb
index 6cc2dda4e..2ec4180a1 100644
--- a/app/controllers/weapps/attendances_controller.rb
+++ b/app/controllers/weapps/attendances_controller.rb
@@ -94,7 +94,9 @@ class Weapps::AttendancesController < ApplicationController
     @absence_count = @attendance.absence_count
     @all_count = @attendance.course_member_attendances.size
 
-    @_is_current_attendance = @attendance.current_attendance?
+    a_end_time = "#{@attendance.attendance_date} #{@attendance.end_time}".to_time
+
+    @_is_current_attendance = Time.current < a_end_time
 
     if @attendance.course_attendance_groups.first&.course_group_id.to_i == 0
       @group_ids = @course.course_groups.pluck(:id) + [0]