diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
index 22e282891e76ba677213fc2d41c54e70ac621dab..d1f3c74c05adfac818441970745357eb2b5d370f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
@@ -190,6 +190,16 @@ class ChatActivity : ServiceBoundActivity() {
     )
   }
 
+  override fun onSaveInstanceState(outState: Bundle?) {
+    super.onSaveInstanceState(outState)
+    outState?.putInt("OPEN_BUFFER", currentBuffer.value ?: -1)
+  }
+
+  override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+    super.onRestoreInstanceState(savedInstanceState)
+    currentBuffer.value = savedInstanceState?.getInt("OPEN_BUFFER", -1)
+  }
+
   override fun onCreateOptionsMenu(menu: Menu?): Boolean {
     menuInflater.inflate(R.menu.activity_main, menu)
     return super.onCreateOptionsMenu(menu)