diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentEventManager.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentEventManager.kt
index fe5dd848..d7f2a7db 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentEventManager.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentEventManager.kt
@@ -177,16 +177,18 @@ class PersistentEventManager(private val dataSource: DataSource) {
             }
         }
 
-        val exception = executeOrException(dataSource.database) {
-            events.insert {
+        withTransaction(dataSource.database) {
+            allEvents.insert {
                 it[referenceId] = message.referenceId
                 it[eventId] = message.eventId
                 it[events.event] = event.event
                 it[integrity] = getIntegrityOfData(message.dataAsJson())
                 it[data] = message.dataAsJson()
             }
+        }
 
-            allEvents.insert {
+        val exception = executeOrException(dataSource.database) {
+            events.insert {
                 it[referenceId] = message.referenceId
                 it[eventId] = message.eventId
                 it[events.event] = event.event