diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
index f3d5a88b..a675b418 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
@@ -166,8 +166,8 @@ class HomeTimetableCard(
                             && !(it.isCancelled && ignoreCancelled)
                 }
 
-                if (lessons.isEmpty() && timetableDate.weekDay <= 5)
-                    break
+                //if (lessons.isEmpty() && timetableDate.weekDay <= 5)
+                //    break
 
                 checkedDays++
             }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
index fb23116c..158f3549 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
@@ -124,6 +124,8 @@ class TimetableFragment : Fragment(), CoroutineScope {
             endHour = lessonRanges.map { it.endTime.hour }.max()?.plus(1) ?: DEFAULT_END_HOUR
         }
         deferred.await()
+        if (!isAdded)
+            return@launch
 
         val pagerAdapter = TimetablePagerAdapter(
                 fragmentManager ?: return@launch,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
index c086cf53..85073b58 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
@@ -229,8 +229,8 @@ class WidgetTimetableProvider : AppWidgetProvider() {
                             && !(it.isCancelled && ignoreCancelled)
                 }
 
-                if (lessons.isEmpty() && timetableDate.weekDay <= 5)
-                    break
+                //if (lessons.isEmpty() && timetableDate.weekDay <= 5)
+                //    break
 
                 checkedDays++
             }