diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
index ddf006e887..e44d863dd5 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
@@ -16,11 +16,11 @@ class FlowsUpdatesFilter(
     val allUpdatesFlow: Flow<Update> = updatesSharedFlow.asSharedFlow()
     @Suppress("MemberVisibilityCanBePrivate")
     val allUpdatesWithoutMediaGroupsGroupingFlow: Flow<Update> = updatesSharedFlow.flatMapConcat {
-        (if (it is SentMediaGroupUpdate) {
-            it.origins
-        } else {
-            listOf(it)
-        }).asFlow()
+        when (it) {
+            is SentMediaGroupUpdate -> it.origins.asFlow()
+            is EditMediaGroupUpdate -> flowOf(it.origin)
+            else -> flowOf(it)
+        }
     }
 
     override val allowedUpdates: List<String>