diff --git a/apps/desktop/electron-forge/trilium-no-cert-check.sh b/apps/desktop/electron-forge/trilium-no-cert-check.sh
index 42ec8bb81d..42dfe1cc8c 100644
--- a/apps/desktop/electron-forge/trilium-no-cert-check.sh
+++ b/apps/desktop/electron-forge/trilium-no-cert-check.sh
@@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export NODE_TLS_REJECT_UNAUTHORIZED=0
 
-"$DIR/trilium"
+exec "$DIR/trilium"
 
diff --git a/apps/desktop/electron-forge/trilium-portable.sh b/apps/desktop/electron-forge/trilium-portable.sh
index 04edfde476..1f69a09a18 100644
--- a/apps/desktop/electron-forge/trilium-portable.sh
+++ b/apps/desktop/electron-forge/trilium-portable.sh
@@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export TRILIUM_DATA_DIR="$DIR/trilium-data"
 
-"$DIR/trilium"
+exec "$DIR/trilium"
 
diff --git a/apps/desktop/electron-forge/trilium-safe-mode.sh b/apps/desktop/electron-forge/trilium-safe-mode.sh
index 5221d4d611..35851fd2c0 100644
--- a/apps/desktop/electron-forge/trilium-safe-mode.sh
+++ b/apps/desktop/electron-forge/trilium-safe-mode.sh
@@ -3,5 +3,5 @@
 DIR=`dirname "$0"`
 export TRILIUM_SAFE_MODE=1
 
-"$DIR/trilium" --disable-gpu
+exec "$DIR/trilium" --disable-gpu
 
diff --git a/apps/server/scripts/build-server.sh b/apps/server/scripts/build-server.sh
index 6396b314bd..d828f65e18 100644
--- a/apps/server/scripts/build-server.sh
+++ b/apps/server/scripts/build-server.sh
@@ -43,7 +43,7 @@ rm -rf $BUILD_DIR/node/lib/node_modules/{npm,corepack} \
     $BUILD_DIR/node_modules/electron* \
     $BUILD_DIR/electron*.{js,map}
 
-printf "#!/bin/sh\n./node/bin/node main.cjs\n" > $BUILD_DIR/trilium.sh
+printf "#!/bin/sh\nexec ./node/bin/node main.cjs\n" > $BUILD_DIR/trilium.sh
 chmod 755 $BUILD_DIR/trilium.sh
 
 VERSION=`jq -r ".version" package.json`