diff --git a/electron-builder.config.cjs b/electron-builder.config.cjs
index 35cc31946a..4baba1d5ca 100644
--- a/electron-builder.config.cjs
+++ b/electron-builder.config.cjs
@@ -104,6 +104,10 @@ const config = {
         confinement: "classic",
         allowNativeWayland: true,
         artifactName: "${name}_${version}_${arch}.${ext}",
+        environment: {
+            XDG_CONFIG_HOME: "$XDG_CONFIG_HOME",
+            XDG_DATA_HOME: "$XDG_DATA_HOME",
+        },
     },
     publish: {
         provider: "generic",
diff --git a/emain/emain-wavesrv.ts b/emain/emain-wavesrv.ts
index b77e909293..a647609441 100644
--- a/emain/emain-wavesrv.ts
+++ b/emain/emain-wavesrv.ts
@@ -104,6 +104,11 @@ export function runWaveSrv(handleWSEvent: (evtMsg: WSEventType) => void): Promis
             }
             process.env[WSServerEndpointVarName] = startParams[1];
             process.env[WebServerEndpointVarName] = startParams[2];
+            delete process.env.XDG_DATA_HOME;
+            delete process.env.XDG_CONFIG_HOME;
+            delete process.env.XDG_RUNTIME_DIR;
+            delete process.env.XDG_CACHE_HOME;
+            delete process.env.XDG_STATE_HOME;
             WaveVersion = startParams[3];
             WaveBuildTime = parseInt(startParams[4]);
             waveSrvReadyResolve(true);