diff --git a/aleksis/apps/chronos/templates/chronos/partials/lesson.html b/aleksis/apps/chronos/templates/chronos/partials/lesson.html
index 5230c94536125ed3d20f0757b63df90c297cfd53..70ef9e72558e55b4c14757dbb0048ba243a76fd3 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/lesson.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/lesson.html
@@ -52,11 +52,11 @@
         {% endif %}
 
 
-        {# When it isn't a room or the old plan, then display the extra text (e. g. work orders) #}
-        {% if not lesson_period.room == lesson_period.get_room and lesson_period.get_room != el and sub.comment %}
+        {# Display the comment (e. g. work orders) #}
+        {% if sub.comment %}
           <br>
           <small>
-            <em>{{ lesson_period.get_substitution.comment }}</em>
+            <em>{{ sub.comment }}</em>
           </small>
         {% endif %}
       {% endwith %}