diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
index d6652c02..cc04a373 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
@@ -20,7 +20,13 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: Coordinator) : C
 
     override fun onProcessEvents(event: PersistentMessage, events: List<PersistentMessage>): MessageDataWrapper? {
         log.info { "${event.referenceId} triggered by ${event.event}" }
-        return super.onProcessEvents(event, events)
+
+        val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterEncodeCreated) {
+            events.findLast { it.event == KafkaEvents.EventMediaParameterEncodeCreated } ?: event
+        } else event
+
+
+        return super.onProcessEvents(forwardEvent, events)
     }
 
 }
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
index d149dabc..4a19492a 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
@@ -21,6 +21,10 @@ class CreateExtractWorkTask(@Autowired override var coordinator: Coordinator) :
     override fun onProcessEvents(event: PersistentMessage, events: List<PersistentMessage>): MessageDataWrapper? {
         log.info { "${event.referenceId} triggered by ${event.event}" }
 
-        return super.onProcessEvents(event, events)
+        val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterExtractCreated) {
+            events.findLast { it.event == KafkaEvents.EventMediaParameterExtractCreated } ?: event
+        } else event
+
+        return super.onProcessEvents(forwardEvent, events)
     }
 }
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/ffmpeg/CreateProcesserWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/ffmpeg/CreateProcesserWorkTask.kt
index 7900d2d7..ad0b4e4d 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/ffmpeg/CreateProcesserWorkTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/ffmpeg/CreateProcesserWorkTask.kt
@@ -21,12 +21,14 @@ abstract class CreateProcesserWorkTask(override var coordinator: Coordinator) :
         if (started == null) {
             log.info { "${event.referenceId} couldn't find start event" }
             return null
-        }
-
-        val proceed = events.find { it.event == KafkaEvents.EventMediaWorkProceedPermitted }
-        if (proceed == null && started.type == ProcessType.MANUAL) {
-            log.warn { "${event.referenceId} waiting for Proceed event due to Manual process" }
-            return null
+        } else if (started.type == ProcessType.MANUAL) {
+            val proceed = events.find { it.event == KafkaEvents.EventMediaWorkProceedPermitted }
+            if (proceed == null) {
+                log.warn { "${event.referenceId} waiting for Proceed event due to Manual process" }
+                return null
+            } else {
+                log.warn { "${event.referenceId} registered proceed permitted" }
+            }
         }