diff --git a/ElectronNET.Host/main.js b/ElectronNET.Host/main.js
index 60b4037..2db6bb1 100644
--- a/ElectronNET.Host/main.js
+++ b/ElectronNET.Host/main.js
@@ -62,6 +62,11 @@ app.on('ready', () => {
 
 });
 
+app.on('quit', async (event, exitCode) => {
+    await server.close();
+    apiProcess.kill();
+});
+
 function isSplashScreenEnabled() {
     if (manifestJsonFile.hasOwnProperty('splashscreen')) {
         if (manifestJsonFile.splashscreen.hasOwnProperty('imageFile')) {