diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/MediumScreenComponent.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/MediumScreenComponent.kt
index d20f824..1f5fb4e 100644
--- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/MediumScreenComponent.kt
+++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/MediumScreenComponent.kt
@@ -326,13 +326,11 @@ class MediumScreenComponent(
             }
 
         launchIO {
-            listStatus.emitAll(newData.mapNotNull { it.status })
-        }
-        launchIO {
-            watchProgress.emitAll(newData.mapNotNull { it.progress })
-        }
-        launchIO {
-            watchRepeat.emitAll(newData.mapNotNull { it.repeat })
+            newData.collect { data ->
+                data.status?.let { listStatus.emit(it) }
+                data.progress?.let { watchProgress.emit(it) }
+                data.repeat?.let { watchRepeat.emit(it) }
+            }
         }
     }