diff --git a/src/views/TimetableView.vue b/src/views/TimetableView.vue
index 051bc74..4f1ca3e 100644
--- a/src/views/TimetableView.vue
+++ b/src/views/TimetableView.vue
@@ -16,7 +16,9 @@ const timetable = computed(() => {
     newElement.substitution = substitutions.value.find((entry) => {
       const entryDay = new Date(entry.date).getTime();
       return (
-        entry.lesson == index + 1 && entryDay == selectedDate.value.getTime()
+        entry.lesson == index + 1 &&
+        entryDay == selectedDate.value.getTime() &&
+        (entry.teacher == e.teacher || !entry.teacher || !e.teacher)
       );
     });
     return newElement;