diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaDetermineSubtitleTrackTypeListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaDetermineSubtitleTrackTypeListener.kt
index 9f8b7e62..2aa70f9a 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaDetermineSubtitleTrackTypeListener.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaDetermineSubtitleTrackTypeListener.kt
@@ -34,7 +34,7 @@ class MediaDetermineSubtitleTrackTypeListener: EventListener() {
 
         return MediaTracksDetermineSubtitleTypeEvent(
             subtitleTrackItems = collected
-        )
+        ).derivedOf(event)
     }
 
 
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaSelectExtractTracksListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaSelectExtractTracksListener.kt
index 4c27b492..c0b7087f 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaSelectExtractTracksListener.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaSelectExtractTracksListener.kt
@@ -32,7 +32,7 @@ class MediaSelectExtractTracksListener: EventListener() {
 
         return MediaTracksExtractSelectedEvent(
             selectedSubtitleTracks = filtered.map { it.index }
-        )
+        ).derivedOf(event)
     }