diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index da2dcc7fe..2a5d2d7c0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -5,8 +5,7 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.HomeworkRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.services.sync.notifications.NewHomeworkNotification
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
@@ -22,13 +21,13 @@ class HomeworkWork @Inject constructor(
         homeworkRepository.getHomework(
             student = student,
             semester = semester,
-            start = now().monday,
-            end = now().sunday,
+            start = now().nextOrSameSchoolDay,
+            end = now().nextOrSameSchoolDay,
             forceRefresh = true,
             notify = preferencesRepository.isNotificationsEnable
         ).waitForResult()
 
-        homeworkRepository.getHomeworkFromDatabase(semester, now().monday, now().sunday).first()
+        homeworkRepository.getHomeworkFromDatabase(semester, now(), now().plusDays(7)).first()
             .filter { !it.isNotified }.let {
                 if (it.isNotEmpty()) newHomeworkNotification.notify(it, student)