diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
index dc6bc719..69803c5d 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
@@ -19,4 +19,4 @@ package im.vector.matrix.android
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.Dispatchers.Main
 
-internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main)
\ No newline at end of file
+internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main, Main)
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt
index 260c80f1..55b92ef8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt
@@ -18,15 +18,15 @@ package im.vector.matrix.android.internal.di
 
 import android.content.Context
 import android.content.res.Resources
-import android.os.Handler
-import android.os.HandlerThread
 import dagger.Module
 import dagger.Provides
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import im.vector.matrix.android.internal.util.createBackgroundHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.android.asCoroutineDispatcher
+import kotlinx.coroutines.asCoroutineDispatcher
 import org.matrix.olm.OlmManager
+import java.util.concurrent.Executors
 
 @Module
 internal object MatrixModule {
@@ -38,7 +38,8 @@ internal object MatrixModule {
         return MatrixCoroutineDispatchers(io = Dispatchers.IO,
                                           computation = Dispatchers.IO,
                                           main = Dispatchers.Main,
-                                          crypto = createBackgroundHandler("Crypto_Thread").asCoroutineDispatcher()
+                                          crypto = createBackgroundHandler("Crypto_Thread").asCoroutineDispatcher(),
+                                          sync = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt
index 3fe850d6..1af5688b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt
@@ -105,8 +105,8 @@ open class SyncService : Service() {
             Timber.v("Execute sync request with timeout 0")
             val params = SyncTask.Params(TIME_OUT)
             cancelableTask = syncTask.configureWith(params)
-                    .callbackOn(TaskThread.CALLER)
-                    .executeOn(TaskThread.CALLER)
+                    .callbackOn(TaskThread.SYNC)
+                    .executeOn(TaskThread.SYNC)
                     .dispatchTo(object : MatrixCallback<Unit> {
                         override fun onSuccess(data: Unit) {
                             cancelableTask = null
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt
index 56d590d7..b6d236ed 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt
@@ -97,8 +97,8 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
                 val latch = CountDownLatch(1)
                 val params = SyncTask.Params(DEFAULT_LONG_POOL_TIMEOUT)
                 cancelableTask = syncTask.configureWith(params)
-                        .callbackOn(TaskThread.CALLER)
-                        .executeOn(TaskThread.CALLER)
+                        .callbackOn(TaskThread.SYNC)
+                        .executeOn(TaskThread.SYNC)
                         .dispatchTo(object : MatrixCallback<Unit> {
                             override fun onSuccess(data: Unit) {
                                 latch.countDown()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
index ff30dbbc..570aa9c4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
@@ -62,8 +62,8 @@ internal class SyncWorker(context: Context,
         val latch = CountDownLatch(1)
         val taskParams = SyncTask.Params(0)
         cancelableTask = syncTask.configureWith(taskParams)
-                .callbackOn(TaskThread.CALLER)
-                .executeOn(TaskThread.CALLER)
+                .callbackOn(TaskThread.SYNC)
+                .executeOn(TaskThread.SYNC)
                 .dispatchTo(object : MatrixCallback<Unit> {
                     override fun onSuccess(data: Unit) {
                         latch.countDown()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt
index c46b86bd..31de5ae7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt
@@ -77,6 +77,7 @@ internal class TaskExecutor @Inject constructor(private val coroutineDispatchers
         TaskThread.IO          -> coroutineDispatchers.io
         TaskThread.CALLER      -> EmptyCoroutineContext
         TaskThread.CRYPTO      -> coroutineDispatchers.crypto
+        TaskThread.SYNC        -> coroutineDispatchers.sync
     }
 
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt
index fc0180c9..659fd3dd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt
@@ -21,5 +21,6 @@ internal enum class TaskThread {
     COMPUTATION,
     IO,
     CALLER,
-    CRYPTO
+    CRYPTO,
+    SYNC
 }
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt
index f58b4313..ef0c91a3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt
@@ -22,5 +22,6 @@ internal data class MatrixCoroutineDispatchers(
         val io: CoroutineDispatcher,
         val computation: CoroutineDispatcher,
         val main: CoroutineDispatcher,
-        val crypto: CoroutineDispatcher
+        val crypto: CoroutineDispatcher,
+        val sync: CoroutineDispatcher
 )
\ No newline at end of file