diff --git a/aleksis/apps/chronos/templates/chronos/partials/event.html b/aleksis/apps/chronos/templates/chronos/partials/event.html
index b45ce48abc0d9414ba29220d935d25dc43a611ea..3ca850407977fd5a75a5e1b824086002c26943fc 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/event.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/event.html
@@ -13,7 +13,7 @@
     {# Teacher or class > Display rooms #}
     {% if type == "teacher" or type == "group" %}
       {% for room in event.rooms.all %}
-        {% include "chronos/partials/room.html" with room=room %}
+        {% include "chronos/partials/room.html" with room=room %}{% if not forloop.last %},{% endif %}
       {% endfor %}
     {% endif %}