diff --git a/plugins/performanceTesting/event-bus/src/com/intellij/tools/ide/starter/bus/shared/SharedEventsFlow.kt b/plugins/performanceTesting/event-bus/src/com/intellij/tools/ide/starter/bus/shared/SharedEventsFlow.kt
index c57c96320f14..0a443ba5a369 100644
--- a/plugins/performanceTesting/event-bus/src/com/intellij/tools/ide/starter/bus/shared/SharedEventsFlow.kt
+++ b/plugins/performanceTesting/event-bus/src/com/intellij/tools/ide/starter/bus/shared/SharedEventsFlow.kt
@@ -24,8 +24,6 @@ class SharedEventsFlow(
   private var serverJob: Job? = null
 
   fun endServerProcess() {
-    runBlocking { serverJob?.cancelAndJoin() }
-    serverJob = null
     client.endServerProcess()
   }
 
@@ -84,6 +82,8 @@ class SharedEventsFlow(
   }
 
   override fun unsubscribeAll() {
+    runBlocking { serverJob?.cancelAndJoin() }
+    serverJob = null
     processedEvents.clear()
     client.clear()
   }