diff --git a/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt
index d593f81..2d20e04 100644
--- a/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt
+++ b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt
@@ -260,8 +260,12 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
                         style = MaterialTheme.typography.bodyLarge
                     )
                     Text(
-                        listOf(lesson.type.label, lesson.subgroup, lesson.teacher, lesson.room)
-                            .filterNotNull()
+                        listOfNotNull(
+                            lesson.type.label,
+                            lesson.subgroup,
+                            lesson.teacher,
+                            lesson.room
+                        )
                             .filter { it.isNotBlank() }
                             .joinToString(" · "),
                         style = MaterialTheme.typography.bodySmall,
diff --git a/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt
index 849d559..c976b92 100644
--- a/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt
+++ b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt
@@ -81,7 +81,7 @@ class ScheduleViewModel(
 
         val dayDate = when {
             weekDays.any { it.date == current.dayDate } -> current.dayDate
-            weekDays.any { it.date == todayDate && todayDate != null } -> todayDate
+            weekDays.any { it.date == todayDate } -> todayDate
             else -> weekDays.firstOrNull()?.date
         }