diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts
index c8f6a0c5b..598b7beed 100644
--- a/shared/server-commands/server/server.ts
+++ b/shared/server-commands/server/server.ts
@@ -250,7 +250,7 @@ export class PeerTubeServer {
     const forkOptions = {
       silent: true,
       env,
-      detached: true,
+      detached: false,
       execArgv
     }
 
@@ -317,7 +317,7 @@ export class PeerTubeServer {
   kill () {
     if (!this.app) return Promise.resolve()
 
-    process.kill(-this.app.pid)
+    process.kill(this.app.pid)
 
     this.app = null