diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
index 2d88125662..10ce0829d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
@@ -16,22 +16,16 @@
 
 package org.matrix.android.sdk.api.session.terms
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 interface TermsService {
     enum class ServiceType {
         IntegrationManager,
         IdentityService
     }
 
-    fun getTerms(serviceType: ServiceType,
-                 baseUrl: String,
-                 callback: MatrixCallback<GetTermsResponse>): Cancelable
+    suspend fun getTerms(serviceType: ServiceType, baseUrl: String): GetTermsResponse
 
-    fun agreeToTerms(serviceType: ServiceType,
-                     baseUrl: String,
-                     agreedUrls: List<String>,
-                     token: String?,
-                     callback: MatrixCallback<Unit>): Cancelable
+    suspend fun agreeToTerms(serviceType: ServiceType,
+                             baseUrl: String,
+                             agreedUrls: List<String>,
+                             token: String?)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index 5eb97cee3a..41914cc799 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -17,11 +17,10 @@
 package org.matrix.android.sdk.internal.session.terms
 
 import dagger.Lazy
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.terms.GetTermsResponse
 import org.matrix.android.sdk.api.session.terms.TermsService
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.network.RetrofitFactory
@@ -33,8 +32,6 @@ import org.matrix.android.sdk.internal.session.sync.model.accountdata.AcceptedTe
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import okhttp3.OkHttpClient
@@ -49,13 +46,11 @@ internal class DefaultTermsService @Inject constructor(
         private val getOpenIdTokenTask: GetOpenIdTokenTask,
         private val identityRegisterTask: IdentityRegisterTask,
         private val updateUserAccountDataTask: UpdateUserAccountDataTask,
-        private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val taskExecutor: TaskExecutor
+        private val coroutineDispatchers: MatrixCoroutineDispatchers
 ) : TermsService {
-    override fun getTerms(serviceType: TermsService.ServiceType,
-                          baseUrl: String,
-                          callback: MatrixCallback<GetTermsResponse>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
+    override suspend fun getTerms(serviceType: TermsService.ServiceType,
+                                 baseUrl: String): GetTermsResponse {
+        return withContext(coroutineDispatchers.main) {
             val url = buildUrl(baseUrl, serviceType)
             val termsResponse = executeRequest<TermsResponse>(null) {
                 apiCall = termsAPI.getTerms("${url}terms")
@@ -64,12 +59,11 @@ internal class DefaultTermsService @Inject constructor(
         }
     }
 
-    override fun agreeToTerms(serviceType: TermsService.ServiceType,
-                              baseUrl: String,
-                              agreedUrls: List<String>,
-                              token: String?,
-                              callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
+    override suspend fun agreeToTerms(serviceType: TermsService.ServiceType,
+                                      baseUrl: String,
+                                      agreedUrls: List<String>,
+                                      token: String?) {
+        withContext(coroutineDispatchers.main) {
             val url = buildUrl(baseUrl, serviceType)
             val tokenToUse = token?.takeIf { it.isNotEmpty() } ?: getToken(baseUrl)
 
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
index 9331f67812..0f07a0353f 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
@@ -31,7 +31,6 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
-import org.matrix.android.sdk.api.session.terms.GetTermsResponse
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.internal.util.awaitCallback
 import java.net.UnknownHostException
@@ -117,9 +116,7 @@ class SetIdentityServerViewModel @AssistedInject constructor(
 
     private suspend fun checkTerms(baseUrl: String) {
         try {
-            val data = awaitCallback<GetTermsResponse> {
-                mxSession.getTerms(TermsService.ServiceType.IdentityService, baseUrl, it)
-            }
+            val data = mxSession.getTerms(TermsService.ServiceType.IdentityService, baseUrl)
 
             // has all been accepted?
             val resp = data.serverResponse
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
index df822807ee..89d6e970cc 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
@@ -28,8 +28,6 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.terms.GetTermsResponse
-import org.matrix.android.sdk.internal.util.awaitCallback
 import timber.log.Timber
 
 class ReviewTermsViewModel @AssistedInject constructor(
@@ -94,15 +92,12 @@ class ReviewTermsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> {
-                    session.agreeToTerms(
-                            termsArgs.type,
-                            termsArgs.baseURL,
-                            agreedUrls,
-                            termsArgs.token,
-                            it
-                    )
-                }
+                session.agreeToTerms(
+                        termsArgs.type,
+                        termsArgs.baseURL,
+                        agreedUrls,
+                        termsArgs.token
+                )
                 _viewEvents.post(ReviewTermsViewEvents.Success)
             } catch (failure: Throwable) {
                 Timber.e(failure, "Failed to agree to terms")
@@ -122,9 +117,7 @@ class ReviewTermsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                val data = awaitCallback<GetTermsResponse> {
-                    session.getTerms(termsArgs.type, termsArgs.baseURL, it)
-                }
+                val data = session.getTerms(termsArgs.type, termsArgs.baseURL)
                 val terms = data.serverResponse.getLocalizedTerms(action.preferredLanguageCode).map {
                     Term(it.localizedUrl ?: "",
                             it.localizedName ?: "",