diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 02d8b964f..32ca20afc 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -74,7 +74,7 @@ class SyncManager @Inject constructor(
         }
     }
 
-    fun startOneTimeSyncWorker(): Flow<WorkInfo> {
+    fun startOneTimeSyncWorker(): Flow<WorkInfo?> {
         val work = OneTimeWorkRequestBuilder<SyncWorker>()
             .setInputData(
                 Data.Builder()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
index 63e86a475..0d404a138 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
@@ -46,7 +46,7 @@ class SyncPresenter @Inject constructor(
     fun onSyncNowClicked() {
         view?.run {
             syncManager.startOneTimeSyncWorker().onEach { workInfo ->
-                when (workInfo.state) {
+                when (workInfo?.state) {
                     WorkInfo.State.ENQUEUED -> {
                         setSyncInProgress(true)
                         Timber.i("Setting sync now started")
@@ -63,9 +63,9 @@ class SyncPresenter @Inject constructor(
                         )
                         analytics.logEvent("sync_now", "status" to "failed")
                     }
-                    else -> Timber.d("Sync now state: ${workInfo.state}")
+                    else -> Timber.d("Sync now state: ${workInfo?.state}")
                 }
-                if (workInfo.state.isFinished) {
+                if (workInfo?.state?.isFinished == true) {
                     setSyncInProgress(false)
                     setSyncDateInView()
                 }