diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py
index bdb1cf80..e467c5dc 100644
--- a/cara/apps/calculator/model_generator.py
+++ b/cara/apps/calculator/model_generator.py
@@ -242,27 +242,37 @@ class FormData:
         )
         return exposed
 
-    def coffee_break_times(self) -> typing.Tuple[typing.Tuple[int, int]]:
+    def coffee_break_times(self, start, finish, nbreaks) -> typing.Tuple[typing.Tuple[int, int]]:
         if not self.coffee_breaks:
             return ()
-        coffee_period = (self.activity_finish - self.activity_start) // self.coffee_breaks
+        break_delay = ((finish - start) - (nbreaks * self.coffee_duration)) // (nbreaks+1)
         coffee_times = []
-        for minute in range(self.activity_start, self.activity_finish, coffee_period):
-            start = minute + coffee_period // 2
-            end = start + self.coffee_duration
-            coffee_times.append((start, end))
+        end = start
+        for n in range(nbreaks):
+            begin = end + break_delay
+            end = begin + self.coffee_duration
+            coffee_times.append((begin, end))
         return tuple(coffee_times)
 
     def present_interval(self, start, finish) -> models.Interval:
         leave_times = []
         enter_times = []
         if self.lunch_option:
+            for coffee_start, coffee_end in self.coffee_break_times(
+                    self.activity_start,self.lunch_start,self.coffee_breaks // 2):
+                leave_times.append(coffee_start)
+                enter_times.append(coffee_end)
             leave_times.append(self.lunch_start)
             enter_times.append(self.lunch_finish)
-
-        for coffee_start, coffee_end in self.coffee_break_times():
-            leave_times.append(coffee_start)
-            enter_times.append(coffee_end)
+            for coffee_start, coffee_end in self.coffee_break_times(
+                    self.lunch_finish,self.activity_finish,self.coffee_breaks // 2):
+                leave_times.append(coffee_start)
+                enter_times.append(coffee_end)
+        else:
+            for coffee_start, coffee_end in self.coffee_break_times(
+                    self.activity_start,self.activity_finish,self.coffee_breaks):
+                leave_times.append(coffee_start)
+                enter_times.append(coffee_end)
 
         # These lists represent the times where the infected person leaves or enters the room, respectively, sorted in
         # reverse order. Note that these lists allows the person to "leave" when they should not even be present in the
diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index 451e60f2..8d50348b 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -121,9 +121,18 @@
 		each of {{ form.coffee_duration }} minutes duration
 		</p></li>
 		<ul>
-		{%- for start_time, end_time in form.coffee_break_times() %}
+		{% if form.lunch_option%}
+		{%- for start_time, end_time in form.coffee_break_times(form.activity_start,form.lunch_start,form.coffee_breaks//2) %}
 		<li><p class="data_subtext">Coffee break {{ loop.index }}: Start: {{ start_time | minutes_to_time }} &nbsp&nbsp End: {{ end_time | minutes_to_time }}</p></li>
     	{%- endfor %}
+		{%- for start_time, end_time in form.coffee_break_times(form.lunch_finish,form.activity_finish,form.coffee_breaks//2) %}
+		<li><p class="data_subtext">Coffee break {{ loop.index }}: Start: {{ start_time | minutes_to_time }} &nbsp&nbsp End: {{ end_time | minutes_to_time }}</p></li>
+    	{%- endfor %}
+		{% else%}
+		{%- for start_time, end_time in form.coffee_break_times(form.activity_start,form.activity_finish,form.coffee_breaks) %}
+		<li><p class="data_subtext">Coffee break {{ loop.index }}: Start: {{ start_time | minutes_to_time }} &nbsp&nbsp End: {{ end_time | minutes_to_time }}</p></li>
+    	{%- endfor %}
+		{% endif %}
 		</ul>
 		{% endif %}
 	</ul>
@@ -178,4 +187,4 @@
 	    <b>We do not assume responsibility for any injury or damage to persons or property arising out of or related to any use of this app.</b></p>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>