diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt
index eee12af307caaf28eb75286e22854b17ec8f3b99..3b6f69dcd59ccffc940e715e114baeed5fbc2fe3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt
@@ -304,7 +304,7 @@ class BufferSyncer constructor(
     networkId: NetworkId? = null,
     type: Buffer_Types? = null,
     groupId: Int? = null
-  ) = _bufferInfos.values.filter {
+  ) = _bufferInfos.values.toList().asSequence().filter {
     bufferId == null || it.bufferId == bufferId
   }.filter {
     networkId == null || it.networkId == networkId
@@ -315,7 +315,7 @@ class BufferSyncer constructor(
   }.filter {
     val caseMapper = IrcCaseMappers[session.networks[it.networkId]?.support("CASEMAPPING")]
     bufferName == null || caseMapper.equalsIgnoreCaseNullable(it.bufferName, bufferName)
-  }
+  }.toList()
 
   fun liveAll(
     bufferName: String? = null,
@@ -324,7 +324,7 @@ class BufferSyncer constructor(
     type: Buffer_Types? = null,
     groupId: Int? = null
   ) = liveBufferInfos().map {
-    it.values.filter {
+    it.values.toList().asSequence().filter {
       bufferId == null || it.bufferId == bufferId
     }.filter {
       networkId == null || it.networkId == networkId
@@ -335,7 +335,7 @@ class BufferSyncer constructor(
     }.filter {
       val caseMapper = IrcCaseMappers[session.networks[it.networkId]?.support("CASEMAPPING")]
       bufferName == null || caseMapper.equalsIgnoreCaseNullable(it.bufferName, bufferName)
-    }
+    }.toList()
   }
 
   fun find(