diff --git a/app/views/assignments/by_user.html.erb b/app/views/assignments/by_user.html.erb
index 6c5f2da73e895ea72372b59328a5e2a70154adcd..0a5bdafbc7cdc9de08ebea406de5ed798092919b 100644
--- a/app/views/assignments/by_user.html.erb
+++ b/app/views/assignments/by_user.html.erb
@@ -8,7 +8,7 @@
   <div>
     <h2 class="text-lg my-4">List View</h2>
     <% @user.assignments.includes(:session, session: :conference).order('sessions.starts_at').group_by { |a| a.session.starts_at.strftime('%Y-%m-%d') }.each do |date, assignments_on_date| %>
-      <h5 class="text-base mt-2 <%= date < now ? "past" : "future" %>"><%= date %></h5>
+      <h5 class="text-base mt-2 <%= Time.parse(date).end_of_day < now ? "past" : "future" %>"><%= date %></h5>
       <ol class="list-inside">
         <% assignments_on_date.each do |assignment| %>
           <li class="<%= assignment.session.starts_at < now ? "past" : "future" %>">
@@ -38,7 +38,7 @@
       </thead>
       <tbody>
     <% @user.assignments.includes(:session, session: :conference).order('sessions.starts_at').each do |assignment| %>
-      <tr class="*:border *:p-1 <%= assignment.session.starts_at < Time.now ? "past" : "future" %>">
+      <tr class="*:border *:p-1 <%= assignment.session.ends_at < Time.now ? "past" : "future" %>">
         <td><%= assignment.session.starts_at.strftime('%Y-%m-%d') %></td>
         <td><%= assignment.session.starts_at.strftime('%H:%M') %></td>
         <td><%= assignment.session.ends_at.strftime('%H:%M') %></td>
diff --git a/app/views/assignments/index.html.erb b/app/views/assignments/index.html.erb
index 958ec7efe304dc489cd0cfca3cf78925285e4abf..c3cd842c9f33e066446d4933dbb63eda66a3dd09 100644
--- a/app/views/assignments/index.html.erb
+++ b/app/views/assignments/index.html.erb
@@ -4,7 +4,7 @@
     <div class="my-8">
       <h4 class="text-xl my-2"><%= link_to user.name, user_assignments_path(user) %> <span class="font-normal"><%= link_to user_assignments_path(user, format: 'ics') do %><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="ml-2 mb-1 size-4 inline-block stroke-slate-400 fill-slate-400"><path fill-rule="evenodd" d="M5.75 2a.75.75 0 01.75.75V4h7V2.75a.75.75 0 011.5 0V4h.25A2.75 2.75 0 0118 6.75v8.5A2.75 2.75 0 0115.25 18H4.75A2.75 2.75 0 012 15.25v-8.5A2.75 2.75 0 014.75 4H5V2.75A.75.75 0 015.75 2zm-1 5.5c-.69 0-1.25.56-1.25 1.25v6.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-6.5c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"></path></svg><% end %></span></h4>
         <% assignments.group_by { |a| a.session.starts_at.strftime('%Y-%m-%d') }.each do |date, assignments_on_date| %>
-          <h5 class="text-base mt-2 <%= date < now ? "past" : "future" %>"><%= date %></h5>
+          <h5 class="text-base mt-2 <%= Time.parse(date).end_of_day < now ? "past" : "future" %>"><%= date %></h5>
           <ol class="list-inside">
             <% assignments_on_date.each do |assignment| %>
               <li class="<%= assignment.session.starts_at < now ? "past" : "future" %>">
diff --git a/app/views/sessions/_session.html.erb b/app/views/sessions/_session.html.erb
index daf066371c0746b6a518f028a441884f5823a4f6..5d5ca3731a54a79b73afa53ee4139b37748eaf0d 100644
--- a/app/views/sessions/_session.html.erb
+++ b/app/views/sessions/_session.html.erb
@@ -1,6 +1,6 @@
 <% unassigned_users = User.all - session.assignments.collect(&:user) %>
 <%= turbo_frame_tag dom_id(session) do %>
-  <div class="session shadow hover:shadow-lg overflow-scroll text-sm w-full !h-full min-h-full hover:!min-h-max <%= session.translators_needed? ? "translators-needed" : "no-translators-needed" %> <%= session.backup_needed? ? "backup-needed" : "no-backup-needed" %> <%= session.assignees? ? "has-assignees" : "no-assignees" %> <%= (session.starts_at < Time.now ? "past" : "") %>">
+  <div class="session shadow hover:shadow-lg overflow-scroll text-sm w-full !h-full min-h-full hover:!min-h-max <%= session.translators_needed? ? "translators-needed" : "no-translators-needed" %> <%= session.backup_needed? ? "backup-needed" : "no-backup-needed" %> <%= session.assignees? ? "has-assignees" : "no-assignees" %> <%= (session.ends_at < Time.now ? "past" : "") %>">
     <h4>
       <small class="text-2xs uppercase font-light bg-black/10 rounded-sm p-1 mr-1 lang-<%= session.language %>"><%= session.language %></small>
       <%= link_to session.title, session.url, target: "_top" %>