diff --git a/packaging/linux/after-remove.sh b/packaging/linux/after-remove.sh
index e68233b..51f22b7 100755
--- a/packaging/linux/after-remove.sh
+++ b/packaging/linux/after-remove.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
 
-# Stop the service
-systemctl stop farmcontrol-server.service
-
-# Disable the service
-systemctl disable farmcontrol-server.service
-
-# Reload systemd
-systemctl daemon-reload
-
+# Reload systemd after unit file removal
+systemctl daemon-reload 2>/dev/null || true
diff --git a/packaging/linux/before-remove.sh b/packaging/linux/before-remove.sh
new file mode 100755
index 0000000..934b023
--- /dev/null
+++ b/packaging/linux/before-remove.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Stop and disable before package files (including the unit file) are removed
+systemctl stop farmcontrol-server.service 2>/dev/null || true
+systemctl disable farmcontrol-server.service 2>/dev/null || true
+systemctl daemon-reload 2>/dev/null || true
diff --git a/scripts/build-linux-packages.sh b/scripts/build-linux-packages.sh
index c808840..0adaa10 100755
--- a/scripts/build-linux-packages.sh
+++ b/scripts/build-linux-packages.sh
@@ -12,6 +12,7 @@ common_fpm_args=(
   -p "${output_dir}/"
   -v "${version}"
   --after-install packaging/linux/after-install.sh
+  --before-remove packaging/linux/before-remove.sh
   --after-remove packaging/linux/after-remove.sh
   "${binary}=/usr/bin/farmcontrol-server"
   packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service
diff --git a/src/config.js b/src/config.js
index 3fbe571..e7ac26c 100644
--- a/src/config.js
+++ b/src/config.js
@@ -9,8 +9,10 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const isPackaged = __dirname.includes("app.asar");
 
-const NODE_ENV =
-  process.env.NODE_ENV || (isPackaged ? "production" : "development");
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = "production";
+}
+const NODE_ENV = process.env.NODE_ENV;
 
 // Configure paths
 function getProductionConfigPath() {
diff --git a/src/index.js b/src/index.js
index baebd1a..48012f8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,15 @@
-import axios from "axios";
 import { loadConfig } from "./config.js";
+import axios from "axios";
 import log4js from "log4js";
 import { createElectronWindow } from "./electron/window.js";
 import { setupIPC } from "./electron/ipc.js";
 import { LOCAL_SERVER_PORT, LocalServer } from "./localserver/localserver.js";
 import { SocketClient } from "./socket/socketclient.js";
 
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = "production";
+}
+
 // Load configuration
 const config = loadConfig();