diff --git a/src/server/emulation_task.rs b/src/server/emulation_task.rs
index c499433..554938a 100644
--- a/src/server/emulation_task.rs
+++ b/src/server/emulation_task.rs
@@ -98,15 +98,16 @@ async fn do_emulation(
 
     server.set_emulation_status(Status::Enabled);
 
-    let res = do_emulation_session(server, &mut emulation, rx, udp_rx, sender_tx, capture_tx).await;
-    emulation.terminate().await;
-    res?;
-
     // add clients
     for handle in server.active_clients() {
         emulation.create(handle).await;
     }
 
+    let res = do_emulation_session(server, &mut emulation, rx, udp_rx, sender_tx, capture_tx).await;
+
+    emulation.terminate().await;
+    res?;
+
     // release potentially still pressed keys
     release_all_keys(server, &mut emulation).await?;