diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkItem.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkItem.java
index 399870d15d348db53fd89e3ac73f52c02be5b6cc..042de87f7ae1570ec68bfabd767be2c4699f1a53 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkItem.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkItem.java
@@ -161,10 +161,15 @@ public class NetworkItem implements ParentListItem {
             public void notifyItemChanged(Integer element) {
                 Buffer buffer = NetworkItem.this.context.client().bufferManager().buffer(element);
                 if (buffer != null && buffer.getInfo().networkId == NetworkItem.this.network.networkId() && bufferList.contains(buffer)) {
-                    buffers.remove(bufferList.indexOf(buffer));
-                    bufferList.remove(buffer);
-                    buffers.add(buffer);
-                    bufferList.add(buffers.indexOf(buffer), buffer);
+                    int position = buffers.indexOf(buffer);
+                    if (position == -1) {
+                        buffers.remove(bufferList.indexOf(buffer));
+                        bufferList.remove(buffer);
+                        buffers.add(buffer);
+                        bufferList.add(buffers.indexOf(buffer), buffer);
+                    } else {
+                        buffers.notifyItemChanged(position);
+                    }
                 }
             }
         });