diff --git a/surfsense_desktop/package.json b/surfsense_desktop/package.json
index 0ad279ece..4ee6ea3c4 100644
--- a/surfsense_desktop/package.json
+++ b/surfsense_desktop/package.json
@@ -1,5 +1,6 @@
 {
   "name": "surfsense-desktop",
+  "productName": "SurfSense",
   "version": "0.0.25",
   "description": "SurfSense Desktop App",
   "main": "dist/main.js",
diff --git a/surfsense_desktop/src/main.ts b/surfsense_desktop/src/main.ts
index 492c61f17..632758ba8 100644
--- a/surfsense_desktop/src/main.ts
+++ b/surfsense_desktop/src/main.ts
@@ -1,7 +1,7 @@
 import { app } from 'electron';
 
 import { registerGlobalErrorHandlers, showErrorDialog } from './modules/errors';
-import { startNextServer } from './modules/server';
+import { startNextServer, stopNextServer } from './modules/server';
 import { createMainWindow, getMainWindow, markQuitting } from './modules/window';
 import { setupDeepLinks, handlePendingDeepLink, hasPendingDeepLink } from './modules/deep-links';
 import { setupAutoUpdater } from './modules/auto-updater';
@@ -19,6 +19,7 @@ import {
 } from './modules/auto-launch';
 
 registerGlobalErrorHandlers();
+app.setName('SurfSense');
 
 if (!setupDeepLinks()) {
   app.quit();
@@ -93,6 +94,7 @@ app.on('will-quit', async (e) => {
   e.preventDefault();
   unregisterQuickAsk();
   unregisterFolderWatcher();
+  stopNextServer();
   destroyTray();
   await shutdownAnalytics();
   app.exit();