diff --git a/aleksis/apps/chronos/templates/chronos/partials/elements.html b/aleksis/apps/chronos/templates/chronos/partials/elements.html
index 825a3291b9d904f277223f5ededa05a301d1e86f..d7c4fb170a1faa3763855d6a70ec174e790f3c2a 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/elements.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/elements.html
@@ -3,9 +3,9 @@
     {% for element in elements %}
       {% if element.label_ == "lesson_period" %}
         {% include "chronos/partials/lesson.html" with lesson_period=element %}
-      {% elif element.label_ == "extra_lesson" %}
+      {% elif element.label_ == "extra_lesson" and smart %}
         {% include "chronos/partials/extra_lesson.html" with extra_lesson=element %}
-      {% elif element.label_ == "event" %}
+      {% elif element.label_ == "event" and smart %}
         {% include "chronos/partials/event.html" with event=element %}
       {% endif %}
     {% endfor %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/lesson.html b/aleksis/apps/chronos/templates/chronos/partials/lesson.html
index 70ef9e72558e55b4c14757dbb0048ba243a76fd3..5b7ceb6c511f43087f2f76af5429967131682d92 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/lesson.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/lesson.html
@@ -12,9 +12,7 @@
      class="{% if lesson_period.get_substitution and smart %}lesson-with-sub{% endif %}"
 >
   <p>
-    {% if lesson_period.is_hol and smart %}
-      {# Do nothing #}
-    {% elif lesson_period.get_substitution and smart %}
+    {% if lesson_period.get_substitution and smart %}
       {% with sub=lesson_period.get_substitution %}
         {# SUBSTITUTION #}
         {% if type.value == "room" and lesson_period.room != lesson_period.get_room and lesson_period.get_room != el %}