diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/KafkatorioTopology.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/KafkatorioTopology.kt
index 359ee48..6d4e693 100644
--- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/KafkatorioTopology.kt
+++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/KafkatorioTopology.kt
@@ -32,7 +32,7 @@ internal class KafkatorioTopology(
 ) : CoroutineScope {
 
   override val coroutineContext: CoroutineContext =
-    Dispatchers.Default + SupervisorJob(rootJob) + CoroutineName("KafkatorioTopology")
+    Dispatchers.Default + rootJob + CoroutineName("KafkatorioTopology")
 
   fun start() {
     splitPackets()
diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/WebsocketServer.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/WebsocketServer.kt
index 99721bb..aa03266 100644
--- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/WebsocketServer.kt
+++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/WebsocketServer.kt
@@ -21,7 +21,7 @@ import org.http4k.websocket.WsStatus
 class WebsocketServer {
 
   // create a scope+job for the server
-  private val serverJob = SupervisorJob()
+  private val serverJob = KafkatorioTopology.rootJob
   private val serverScope = CoroutineScope(serverJob)
 
   private val clients: MutableSharedFlow<Websocket> = MutableSharedFlow(