diff --git a/app/main-es6/server/server.js b/app/main-es6/server/server.js
index 6da57f74..2995840d 100644
--- a/app/main-es6/server/server.js
+++ b/app/main-es6/server/server.js
@@ -5,6 +5,7 @@ const cp = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const logger = require('../utils/logger');
+const app = require('electron').app;
 
 module.exports = (context) => {
   const rpc = context.rpc;
@@ -46,6 +47,12 @@ module.exports = (context) => {
     workerProcess.on('message', (msg) => {
       handleWorkerMessage(msg);
     });
+    app.on('quit', () => {
+      try {
+        if (workerProcess)
+          workerProcess.kill();
+      } catch (e) { }
+    });
   }
 
   rpc.on('search', (evt, params) => {