diff --git a/app/src/main/java/com/fastaccess/github/usecase/user/BlockUnblockUserUseCase.kt b/app/src/main/java/com/fastaccess/github/usecase/user/BlockUnblockUserUseCase.kt
index d9b762d8..d1ef3a27 100644
--- a/app/src/main/java/com/fastaccess/github/usecase/user/BlockUnblockUserUseCase.kt
+++ b/app/src/main/java/com/fastaccess/github/usecase/user/BlockUnblockUserUseCase.kt
@@ -18,8 +18,6 @@ class BlockUnblockUserUseCase @Inject constructor(
 
     override fun buildObservable(): Observable<Boolean> = login?.let { login ->
         userRepository.blockUnblockUser(login, block)
-            .subscribeOn(schedulerProvider.ioThread())
-            .observeOn(schedulerProvider.uiThread())
             .map {
                 val isSuccess = it.isSuccessful && it.code() == 204
                 if (isSuccess) {
@@ -27,5 +25,7 @@ class BlockUnblockUserUseCase @Inject constructor(
                 }
                 return@map isSuccess
             }
+            .subscribeOn(schedulerProvider.ioThread())
+            .observeOn(schedulerProvider.uiThread())
     } ?: Observable.empty()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/github/usecase/user/FollowUnfollowUserUseCase.kt b/app/src/main/java/com/fastaccess/github/usecase/user/FollowUnfollowUserUseCase.kt
index 6af1ea5c..e81c4071 100644
--- a/app/src/main/java/com/fastaccess/github/usecase/user/FollowUnfollowUserUseCase.kt
+++ b/app/src/main/java/com/fastaccess/github/usecase/user/FollowUnfollowUserUseCase.kt
@@ -1,5 +1,6 @@
 package com.fastaccess.github.usecase.user
 
+import com.fastaccess.data.repository.SchedulerProvider
 import com.fastaccess.data.repository.UserRepository
 import com.fastaccess.domain.usecase.base.BaseObservableUseCase
 import io.reactivex.Observable
@@ -8,7 +9,10 @@ import javax.inject.Inject
 /**
  * Created by Kosh on 10.06.18.
  */
-class FollowUnfollowUserUseCase @Inject constructor(private val userRepository: UserRepository) : BaseObservableUseCase() {
+class FollowUnfollowUserUseCase @Inject constructor(
+    private val userRepository: UserRepository,
+    private val schedulerProvider: SchedulerProvider
+) : BaseObservableUseCase() {
     var login: String? = null
     var follow: Boolean = false
 
@@ -25,5 +29,7 @@ class FollowUnfollowUserUseCase @Inject constructor(private val userRepository:
                 }
                 return@map isSuccess
             }
+            .subscribeOn(schedulerProvider.ioThread())
+            .observeOn(schedulerProvider.uiThread())
     } ?: Observable.empty()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/github/usecase/user/IsUserBlockedUseCase.kt b/app/src/main/java/com/fastaccess/github/usecase/user/IsUserBlockedUseCase.kt
index 3e22503c..214768e3 100644
--- a/app/src/main/java/com/fastaccess/github/usecase/user/IsUserBlockedUseCase.kt
+++ b/app/src/main/java/com/fastaccess/github/usecase/user/IsUserBlockedUseCase.kt
@@ -17,8 +17,8 @@ class IsUserBlockedUseCase @Inject constructor(
 
     override fun buildObservable(): Observable<Boolean> = login?.let { login ->
         userRepository.isUserBlocked(login)
+            .map { it.isSuccessful && it.code() == 204 }
             .subscribeOn(schedulerProvider.ioThread())
             .observeOn(schedulerProvider.uiThread())
-            .map { it.isSuccessful && it.code() == 204 }
     } ?: Observable.empty()
 }
\ No newline at end of file