diff --git a/app/src/bridge/components/mediaServer.ts b/app/src/bridge/components/mediaServer.ts
index ff5e312..c20ea79 100644
--- a/app/src/bridge/components/mediaServer.ts
+++ b/app/src/bridge/components/mediaServer.ts
@@ -185,9 +185,9 @@ export function stopMediaServer() {
             mediaServer.close(err => {
                 if (err) {
                     reject();
+                } else {
+                    resolve();
                 }
-
-                resolve();
             });
 
             mediaServer = undefined;
diff --git a/app/src/bridge/index.ts b/app/src/bridge/index.ts
index 7c26bfa..3967f99 100755
--- a/app/src/bridge/index.ts
+++ b/app/src/bridge/index.ts
@@ -10,9 +10,11 @@ import { startMediaServer, stopMediaServer } from "./components/mediaServer";
 
 import { applicationVersion } from "../../config.json";
 
-process.on("SIGTERM", () => {
+process.on("SIGTERM", async () => {
     discovery?.stop();
-    stopMediaServer();
+    await stopMediaServer();
+
+    process.exit(1);
 });
 
 let discovery: Discovery | null = null;