diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt
index 3ae29e60..e974b92d 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt
@@ -109,8 +109,7 @@ class ConvertWorkTaskListener: WorkTaskListener() {
                 metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
                 data = convertData
             ).also { event ->
-                onProduceEvent(event)
-                taskManager.createTask(
+                val taskCreatedSuccessfully = taskManager.createTask(
                     referenceId = event.referenceId(),
                     eventId = event.eventId(),
                     derivedFromEventId = event.derivedFromEventId(),
@@ -118,6 +117,13 @@ class ConvertWorkTaskListener: WorkTaskListener() {
                     data = WGson.gson.toJson(event.data!!),
                     inputFile = event.data!!.inputFile
                 )
+
+                if (!taskCreatedSuccessfully) {
+                    log.error { "Failed to create task for events on referenceId: ${event.referenceId()}" }
+                } else {
+                    onProduceEvent(event)
+                }
+
             }
         }
         active = false
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt
index 045e84de..1ce19ab0 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt
@@ -58,8 +58,7 @@ class EncodeWorkTaskListener : WorkTaskListener() {
             metadata = event.makeDerivedEventInfo(EventStatus.Success, getProducerName()),
             data = encodeArguments
         ).also { event ->
-            onProduceEvent(event)
-            taskManager.createTask(
+            val taskCreatedSuccessfully = taskManager.createTask(
                 referenceId = event.referenceId(),
                 eventId = event.eventId(),
                 derivedFromEventId = event.derivedFromEventId(),
@@ -67,6 +66,11 @@ class EncodeWorkTaskListener : WorkTaskListener() {
                 data = WGson.gson.toJson(event.data!!),
                 inputFile = event.data!!.inputFile
             )
+            if (!taskCreatedSuccessfully) {
+                log.error { "Failed to create task for events on referenceId: ${event.referenceId()}" }
+            } else {
+                onProduceEvent(event)
+            }
         }
         active = false
     }
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt
index 0ca31701..ddcb1a1a 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt
@@ -67,8 +67,7 @@ class ExtractWorkTaskListener: WorkTaskListener() {
                 data = it
             )
         }.forEach { event ->
-            onProduceEvent(event)
-            taskManager.createTask(
+            val taskCreatedSuccessfully = taskManager.createTask(
                 referenceId = event.referenceId(),
                 eventId = event.eventId(),
                 derivedFromEventId = event.derivedFromEventId(),
@@ -76,6 +75,11 @@ class ExtractWorkTaskListener: WorkTaskListener() {
                 data = WGson.gson.toJson(event.data!!),
                 inputFile = event.data!!.inputFile
             )
+            if (!taskCreatedSuccessfully) {
+                log.error { "Failed to create task for events on referenceId: ${event.referenceId()}" }
+            } else {
+                onProduceEvent(event)
+            }
         }
         active = false
     }