diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt
index 306b7d4e..ac6a173a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt
@@ -23,9 +23,13 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
         const val TAG = "LibrusSynergiaHomework"
     }
 
-    init {
+    init { data.profile?.also { profile ->
         synergiaGet(TAG, "moje_zadania", method = POST, parameters = mapOf(
-                "dataOd" to Date.getToday().stringY_m_d,
+                "dataOd" to
+                        if (!data.profile.empty)
+                            profile.getSemesterStart(1).stringY_m_d
+                        else
+                            Date.getToday().stringY_m_d,
                 "dataDo" to Date.getToday().stepForward(0, 0, 7).stringY_m_d,
                 "przedmiot" to -1
 
@@ -61,7 +65,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
                     val description = "Treść: (.*)".toRegex(RegexOption.DOT_MATCHES_ALL).find(moreInfo)
                             ?.get(1)?.replace("<br.*/>".toRegex(), "\n")?.trim()
 
-                    val seen = when (profile?.empty) {
+                    val seen = when (profile.empty) {
                         true -> true
                         else -> eventDate < Date.getToday()
                     }
@@ -98,5 +102,5 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
             data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK, 2 * HOUR, DRAWER_ITEM_HOMEWORK)
             onSuccess()
         }
-    }
+    } ?: onSuccess() }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt
index d06c4a9d..407951d6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt
@@ -26,7 +26,7 @@ class NotifyTask : IApiTask(-1) {
         val list = app.db.notificationDao().getNotPostedNow()
         val notificationList = list.subList(0, min(10, list.size))
 
-        var unreadCount = list.size
+        val unreadCount = list.size
 
         for (notification in notificationList) {
             val intent = Intent(app, MainActivity::class.java)