diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index 81a819144f29366bbd344ab2c45d498199aea4cf..51dace5c3fbdad858002a949eb6db456e46b46b6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -451,10 +451,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
       .firstElement()
       .toLiveData()
       .observe(this, Observer {
-        if (resources.getBoolean(R.bool.buffer_drawer_exists) &&
-            viewModel.buffer.value == Int.MAX_VALUE &&
-            isInitialConnect) {
-          drawerLayout.openDrawer(Gravity.START)
+        if (isInitialConnect) {
+          if (resources.getBoolean(R.bool.buffer_drawer_exists) &&
+              viewModel.buffer.value == Int.MAX_VALUE) {
+            drawerLayout.openDrawer(Gravity.START)
+          }
           isInitialConnect = false
           viewModel.session.value?.orNull()?.let {
             if (it.identities.isEmpty()) {