diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
index 487a4c0f1..2d76e2416 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
@@ -50,7 +50,6 @@ import autodagger.AutoInjector;
 import io.reactivex.CompletableObserver;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
@@ -89,7 +88,7 @@ public class AccountRemovalWorker extends Worker {
 
                     ncApi.unregisterDeviceForNotificationsWithNextcloud(ApiUtils.getCredentials(userEntity.getUsername(),
                             userEntity.getToken()), ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl()))
-                            .subscribe(new Observer<GenericOverall>() {
+                            .blockingSubscribe(new Observer<GenericOverall>() {
                                 @Override
                                 public void onSubscribe(Disposable d) {
 
@@ -108,7 +107,7 @@ public class AccountRemovalWorker extends Worker {
                                         ncApi.unregisterDeviceForNotificationsWithProxy
                                                 (ApiUtils.getCredentials(userEntity.getUsername(),
                                                         userEntity.getToken()), ApiUtils.getUrlPushProxy(), queryMap)
-                                                .subscribe(new Observer<Void>() {
+                                                .blockingSubscribe(new Observer<Void>() {
                                                     @Override
                                                     public void onSubscribe(Disposable d) {
 
@@ -132,8 +131,7 @@ public class AccountRemovalWorker extends Worker {
                                                             }
                                                         }
 
-                                                        userUtils.deleteUser(userEntity.getId()).subscribe(new
-                                                                                                                   CompletableObserver() {
+                                                        userUtils.deleteUser(userEntity.getId()).subscribe(new CompletableObserver() {
                                                                                                                        @Override
                                                                                                                        public void onSubscribe(Disposable d) {
 
@@ -214,6 +212,7 @@ public class AccountRemovalWorker extends Worker {
                         });
             }
         }
+
         return Result.SUCCESS;
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java
index 8ffd0e455..313d32b6b 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java
@@ -46,7 +46,6 @@ import androidx.work.Worker;
 import autodagger.AutoInjector;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
@@ -75,8 +74,7 @@ public class CapabilitiesWorker extends Worker {
                     null, null,
                     null, null, null, internalUserEntity.getId(),
                     LoganSquare.serialize(capabilitiesOverall.getOcs().getData().getCapabilities()), null)
-                    .subscribeOn(Schedulers.newThread())
-                    .subscribe(new Observer<UserEntity>() {
+                    .blockingSubscribe(new Observer<UserEntity>() {
                         @Override
                         public void onSubscribe(Disposable d) {
 
@@ -132,7 +130,7 @@ public class CapabilitiesWorker extends Worker {
             ncApi.getCapabilities(ApiUtils.getCredentials(internalUserEntity.getUsername(),
                     internalUserEntity.getToken()), ApiUtils.getUrlForCapabilities(internalUserEntity.getBaseUrl()))
                     .retry(3)
-                    .subscribe(new Observer<CapabilitiesOverall>() {
+                    .blockingSubscribe(new Observer<CapabilitiesOverall>() {
                         @Override
                         public void onSubscribe(Disposable d) {
 
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
index a13bc5b06..7c711c7bf 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
@@ -106,7 +106,7 @@ public class NotificationWorker extends Worker {
         ncApi.getRoom(ApiUtils.getCredentials(userEntity.getUserId(),
                 userEntity.getToken()), ApiUtils.getRoom(userEntity.getBaseUrl(),
                 intent.getExtras().getString(BundleKeys.KEY_ROOM_TOKEN)))
-                .subscribe(new Observer<RoomOverall>() {
+                .blockingSubscribe(new Observer<RoomOverall>() {
                     @Override
                     public void onSubscribe(Disposable d) {
 
@@ -145,7 +145,7 @@ public class NotificationWorker extends Worker {
         ncApi.getNotification(ApiUtils.getCredentials(userEntity.getUserId(),
                 userEntity.getToken()), ApiUtils.getUrlForNotificationWithId(userEntity.getBaseUrl(),
                 Long.toString(decryptedPushMessage.getNotificationId())))
-                .subscribe(new Observer<NotificationOverall>() {
+                .blockingSubscribe(new Observer<NotificationOverall>() {
                     @Override
                     public void onSubscribe(Disposable d) {