diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index f64ebc9b1..c85fa0f0c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -67,6 +67,7 @@ class AttendancePresenter @Inject constructor(
                         else list.filter { !it.presence }
                     }
                     .map { items -> items.map { AttendanceItem(it) } }
+                    .map { items -> items.sortedBy { it.attendance.number } }
                     .subscribeOn(schedulers.backgroundThread)
                     .observeOn(schedulers.mainThread)
                     .doFinally {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 726717fc7..40c4aa5db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -61,6 +61,7 @@ class TimetablePresenter @Inject constructor(
                     .map { it.single { semester -> semester.current } }
                     .flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
                     .map { items -> items.map { TimetableItem(it, view?.roomString.orEmpty()) } }
+                    .map { items -> items.sortedBy { it.lesson.number } }
                     .subscribeOn(schedulers.backgroundThread)
                     .observeOn(schedulers.mainThread)
                     .doFinally {