diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index d1cd90f960..3b327ffe23 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -2440,7 +2440,7 @@ class ChatActivity :
         currentlyPlayedVoiceMessage?.let { stopMediaPlayer(it) } // FIXME, mediaplayer can sometimes be null here
 
         adapter = null
-        Log.d(TAG, "inConversation was set to false!")
+        disposables.dispose()
     }
 
     private fun joinRoomWithPassword() {
@@ -2505,7 +2505,7 @@ class ChatActivity :
                 ?.observeOn(AndroidSchedulers.mainThread())
                 ?.subscribe(object : Observer<SignalingSettingsOverall> {
                     override fun onSubscribe(d: Disposable) {
-                        // unused atm
+                        disposables.add(d)
                     }
 
                     override fun onNext(signalingSettingsOverall: SignalingSettingsOverall) {