diff --git a/build.gradle.kts b/build.gradle.kts
index 63be78db726b0bface5384110b9cdbca6cc753cd..c2c2bd0d32bf7f7ac9038f4dc61a22287a390bca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,4 +15,4 @@ plugins {
 }
 
 group = "de.justjanne.libquassel"
-version = "0.8.0"
+version = "0.8.1"
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt
index 780c6d21428b808c0a0761982e0c7f74bdf1c1f8..5be23268476465225d8b9bc1f95a2f27ab3395e9 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt
@@ -12,13 +12,13 @@ package de.justjanne.libquassel.protocol.util
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 
 @ExperimentalCoroutinesApi
 @Suppress("NOTHING_TO_INLINE")
 inline fun <T> Flow<StateHolder<T>?>.flatMap(): Flow<T?> =
-  flatMapLatest { it?.flow() ?: emptyFlow() }
+  flatMapLatest { it?.flow() ?: flowOf(null) }
 
 @ExperimentalCoroutinesApi
 inline fun <reified T> Flow<Iterable<StateHolder<T>>?>.combineLatest(): Flow<List<T>> =