diff --git a/app/views/exercises/publish_groups.json.jbuilder b/app/views/exercises/publish_groups.json.jbuilder
index 72cefdd1a..68cf95d2f 100644
--- a/app/views/exercises/publish_groups.json.jbuilder
+++ b/app/views/exercises/publish_groups.json.jbuilder
@@ -1,6 +1,6 @@
 json.course_groups @course_groups do |group|
   json.id group.id
   json.name group.name
-  json.end_time @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
+  json.end_time @exercise.unified_setting ? @exercise.end_time : @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
 end
 json.end_time @exercise.end_time
\ No newline at end of file
diff --git a/app/views/polls/publish_groups.json.jbuilder b/app/views/polls/publish_groups.json.jbuilder
index f63a2ea90..8cf49e959 100644
--- a/app/views/polls/publish_groups.json.jbuilder
+++ b/app/views/polls/publish_groups.json.jbuilder
@@ -1,6 +1,6 @@
 json.course_groups @course_groups do |group|
   json.id group.id
   json.name group.name
-  json.end_time @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
+  json.end_time @poll.unified_setting ? @poll.end_time : @group_settings.select{|group_setting| group_setting.course_group_id == group.id}.first&.end_time
 end
 json.end_time @poll.end_time
\ No newline at end of file