diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt
index e1d52d1e1..d881578fe 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt
@@ -33,17 +33,21 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
 import com.nextcloud.talk.R
 import com.nextcloud.talk.newarch.conversationsList.mvp.BaseView
 import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView
 import com.nextcloud.talk.utils.bundle.BundleKeys
+import com.uber.autodispose.lifecycle.LifecycleScopeProvider
 import de.cotech.hw.fido.WebViewFidoBridge
 import kotlinx.android.synthetic.main.login_entry_view.view.*
 import org.koin.android.ext.android.inject
 import java.util.*
 
 class LoginEntryView(val bundle: Bundle) : BaseView() {
+    override val scopeProvider: LifecycleScopeProvider<*> = ControllerScopeProvider.from(this)
+
     private val protocolSuffix = "://"
     private val dataSeparator = ":"
 
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt
index a515e6e2c..6cd366e64 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt
@@ -31,15 +31,19 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.Observer
 import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
 import com.nextcloud.talk.R
 import com.nextcloud.talk.newarch.conversationsList.mvp.BaseView
 import com.nextcloud.talk.newarch.features.account.loginentry.LoginEntryView
 import com.nextcloud.talk.utils.bundle.BundleKeys
+import com.uber.autodispose.lifecycle.LifecycleScopeProvider
 import kotlinx.android.synthetic.main.server_entry_view.view.*
 import org.koin.android.ext.android.inject
 
 class ServerEntryView : BaseView() {
+    override val scopeProvider: LifecycleScopeProvider<*> = ControllerScopeProvider.from(this)
+
     private lateinit var viewModel: ServerEntryViewModel
     val factory: ServerEntryViewModelFactory by inject()
 
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt
index 866a272c3..ca4d3f3d5 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt
@@ -17,6 +17,7 @@ import coil.api.load
 import coil.target.Target
 import coil.transform.CircleCropTransformation
 import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
 import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler
 import com.nextcloud.talk.R
 import com.nextcloud.talk.adapters.messages.*
@@ -42,6 +43,7 @@ import com.stfalcon.chatkit.commons.models.IMessage
 import com.stfalcon.chatkit.messages.MessageHolders
 import com.stfalcon.chatkit.messages.MessagesListAdapter
 import com.stfalcon.chatkit.utils.DateFormatter
+import com.uber.autodispose.lifecycle.LifecycleScopeProvider
 import kotlinx.android.synthetic.main.controller_chat.view.*
 import kotlinx.android.synthetic.main.conversations_list_view.view.*
 import kotlinx.android.synthetic.main.lobby_view.view.*
@@ -54,6 +56,7 @@ import com.stfalcon.chatkit.commons.ImageLoader as ChatKitImageLoader
 
 class ChatView : BaseView(), MessageHolders.ContentChecker<IMessage>, MessagesListAdapter.OnLoadMoreListener, MessagesListAdapter
 .OnMessageLongClickListener<IMessage>, MessagesListAdapter.Formatter<Date> {
+    override val scopeProvider: LifecycleScopeProvider<*> = ControllerScopeProvider.from(this)
 
     lateinit var viewModel: ChatViewModel
     val factory: ChatViewModelFactory by inject()