diff --git a/app/src/main/java/com/readrops/app/MainActivity.kt b/app/src/main/java/com/readrops/app/MainActivity.kt
index 651b2b7c..d703a804 100644
--- a/app/src/main/java/com/readrops/app/MainActivity.kt
+++ b/app/src/main/java/com/readrops/app/MainActivity.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.koin.androidx.compose.KoinAndroidContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
@@ -102,12 +103,12 @@ class MainActivity : ComponentActivity(), KoinComponent {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
 
-        lifecycleScope.launch(Dispatchers.IO) {
+        lifecycleScope.launch {
             handleIntent(intent)
         }
     }
 
-    private suspend fun handleIntent(intent: Intent) {
+    private suspend fun handleIntent(intent: Intent) = withContext(Dispatchers.IO) {
         when {
             intent.hasExtra(SyncWorker.ACCOUNT_ID_KEY) -> {
                 val accountId = intent.getIntExtra(SyncWorker.ACCOUNT_ID_KEY, -1)
diff --git a/db/src/main/java/com/readrops/db/dao/ItemDao.kt b/db/src/main/java/com/readrops/db/dao/ItemDao.kt
index f5a391ce..dccaa585 100644
--- a/db/src/main/java/com/readrops/db/dao/ItemDao.kt
+++ b/db/src/main/java/com/readrops/db/dao/ItemDao.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.Flow
 interface ItemDao : BaseDao<Item> {
 
     @Query("Select * From Item Where id = :itemId")
-    fun select(itemId: Int): Item
+    suspend fun select(itemId: Int): Item
 
     @RawQuery(observedEntities = [Item::class, Feed::class, Folder::class, ItemState::class])
     fun selectAll(query: SupportSQLiteQuery): PagingSource<Int, ItemWithFeed>