diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
index 98bd93eb8..a42a0ab4b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -31,6 +31,7 @@ import io.github.wulkanowy.utils.nickOrName
 import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalDateTime.now
 import javax.inject.Inject
@@ -57,10 +58,13 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
             lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
                 val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
                 cancelScheduledTo(
-                    upcomingTime..lesson.start,
-                    getRequestCode(upcomingTime, studentId)
+                    range = upcomingTime..lesson.start,
+                    requestCode = getRequestCode(upcomingTime, studentId)
+                )
+                cancelScheduledTo(
+                    range = lesson.start..lesson.end,
+                    requestCode = getRequestCode(lesson.start, studentId)
                 )
-                cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
 
                 Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
             }
@@ -82,6 +86,11 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
             return cancelScheduled(lessons, student)
         }
 
+        if (lessons.firstOrNull()?.date?.isAfter(LocalDate.now().plusDays(2)) == true) {
+            Timber.d("Timetable notification scheduling skipped - lessons are too far")
+            return
+        }
+
         withContext(dispatchersProvider.backgroundThread) {
             lessons.groupBy { it.date }
                 .map { it.value.sortedBy { lesson -> lesson.start } }
@@ -96,26 +105,26 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
 
                         if (lesson.start > now()) {
                             scheduleBroadcast(
-                                intent,
-                                student.studentId,
-                                NOTIFICATION_TYPE_UPCOMING,
-                                getUpcomingLessonTime(index, active, lesson)
+                                intent = intent,
+                                studentId = student.studentId,
+                                notificationType = NOTIFICATION_TYPE_UPCOMING,
+                                time = getUpcomingLessonTime(index, active, lesson)
                             )
                         }
 
                         if (lesson.end > now()) {
                             scheduleBroadcast(
-                                intent,
-                                student.studentId,
-                                NOTIFICATION_TYPE_CURRENT,
-                                lesson.start
+                                intent = intent,
+                                studentId = student.studentId,
+                                notificationType = NOTIFICATION_TYPE_CURRENT,
+                                time = lesson.start
                             )
                             if (active.lastIndex == index) {
                                 scheduleBroadcast(
-                                    intent,
-                                    student.studentId,
-                                    NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION,
-                                    lesson.end
+                                    intent = intent,
+                                    studentId = student.studentId,
+                                    notificationType = NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION,
+                                    time = lesson.end
                                 )
                             }
                         }
@@ -143,17 +152,21 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
         notificationType: Int,
         time: LocalDateTime
     ) {
-        AlarmManagerCompat.setExactAndAllowWhileIdle(
-            alarmManager, RTC_WAKEUP, time.toTimestamp(),
-            PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
-                it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
-                it.putExtra(LESSON_TYPE, notificationType)
-            }, FLAG_UPDATE_CURRENT)
-        )
-        Timber.d(
-            "TimetableNotification scheduled: type: $notificationType, subject: ${
-                intent.getStringExtra(LESSON_TITLE)
-            }, start: $time, student: $studentId"
-        )
+        try {
+            AlarmManagerCompat.setExactAndAllowWhileIdle(
+                alarmManager, RTC_WAKEUP, time.toTimestamp(),
+                PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
+                    it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
+                    it.putExtra(LESSON_TYPE, notificationType)
+                }, FLAG_UPDATE_CURRENT)
+            )
+            Timber.d(
+                "TimetableNotification scheduled: type: $notificationType, subject: ${
+                    intent.getStringExtra(LESSON_TITLE)
+                }, start: $time, student: $studentId"
+            )
+        } catch (e: IllegalStateException) {
+            Timber.e(e)
+        }
     }
 }