diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
index d947e59326..864a9d6f57 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
@@ -81,13 +81,11 @@ interface Session :
     /**
      * This method start the sync thread.
      */
-    @MainThread
     fun startSync()
 
     /**
      * This method stop the sync thread.
      */
-    @MainThread
     fun stopSync()
 
     /**
@@ -99,7 +97,6 @@ interface Session :
     /**
      * This method allow to close a session. It does stop some services.
      */
-    @MainThread
     fun close()
 
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
index e77cfd3c2f..bd25efaa89 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
@@ -102,7 +102,6 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
         SyncWorker.stopAnyBackgroundSync(context)
     }
 
-    @MainThread
     override fun startSync() {
         assert(isOpen)
         if (!syncThread.isAlive) {
@@ -113,16 +112,14 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
         }
     }
 
-    @MainThread
     override fun stopSync() {
         assert(isOpen)
         syncThread.kill()
     }
 
-    @MainThread
     override fun close() {
-        assertMainThread()
         assert(isOpen)
+        stopSync()
         liveEntityObservers.forEach { it.dispose() }
         cryptoService.close()
         if (monarchy.isMonarchyThreadOpen) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
index f67663ac8a..2384828128 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
@@ -19,6 +19,7 @@ package im.vector.riotredesign.features
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import androidx.work.WorkManager
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.Authenticator
@@ -66,6 +67,10 @@ class MainActivity : VectorBaseActivity() {
                 override fun onSuccess(data: Unit) {
                     Timber.w("SIGN_OUT: success, start app")
                     sessionHolder.clearActiveSession()
+                    WorkManager.getInstance(applicationContext).also {
+                        it.cancelAllWork()
+                        it.pruneWork()
+                    }
                     start()
                 }
             })