diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
index e720a15720dd592c6197703f1287d622aa4f8424..ca154ae8e49ff6356465ef5ca9718ddcea5050db 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
@@ -62,12 +62,12 @@ class BufferListAdapter(
   init {
     liveData.zip(collapsedNetworks.toLiveData(), selectedBuffer.toLiveData()).observe(
       lifecycleOwner, Observer { it: Triple<List<BufferProps>?, Set<NetworkId>, BufferId>? ->
+      val old: List<BufferListItem> = ArrayList(data)
       runInBackground {
         val list = it?.first ?: emptyList()
         val collapsedNetworks = it?.second ?: emptySet()
         val selected = it?.third ?: -1
 
-        val old: List<BufferListItem> = data
         val new: List<BufferListItem> = list.sortedBy { props ->
           !props.info.type.hasFlag(Buffer_Type.StatusBuffer)
         }.sortedBy { props ->