diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
index 893caf2401fe026c11d274d48ec8ce6809df4b90..233a04e69edf8205abe3ebf72bc00e5c15d9153b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
@@ -267,7 +267,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
 
     var hasRestoredChatListState = false
     listAdapter.setOnUpdateFinishedListener {
-      if (!hasRestoredChatListState) {
+      if (!hasRestoredChatListState && it.isNotEmpty()) {
         savedInstanceState?.getParcelable<Parcelable>(KEY_STATE_LIST)
           ?.let(chatList.layoutManager::onRestoreInstanceState)
         hasRestoredChatListState = true