diff --git a/lib/gui/app/models/flash-state.ts b/lib/gui/app/models/flash-state.ts
index faa1a4a1..9cf59035 100644
--- a/lib/gui/app/models/flash-state.ts
+++ b/lib/gui/app/models/flash-state.ts
@@ -47,13 +47,7 @@ export function isFlashing(): boolean {
  */
 export function setFlashingFlag() {
 	// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
-	try {
-		electron.ipcRenderer.invoke('disable-screensaver');
-	} catch (error) {
-		console.log(
-			"Can't disable-screensaver, we're probably not running on a balena-electron env",
-		);
-	}
+	electron.ipcRenderer.send('disable-screensaver');
 	store.dispatch({
 		type: Actions.SET_FLASHING_FLAG,
 		data: {},
@@ -76,7 +70,8 @@ export function unsetFlashingFlag(results: {
 		data: results,
 	});
 	// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
-	electron.ipcRenderer.invoke('enable-screensaver');
+
+	electron.ipcRenderer.send('enable-screensaver');
 }
 
 export function setDevicePaths(devicePaths: string[]) {
diff --git a/lib/gui/app/modules/api.ts b/lib/gui/app/modules/api.ts
index dd5fa905..fcde1a80 100644
--- a/lib/gui/app/modules/api.ts
+++ b/lib/gui/app/modules/api.ts
@@ -112,10 +112,10 @@ function startApiAndSpawnChild({
 	// server/client has a different name.
 	const IPC_SERVER_ID = `etcher-server-${process.pid}-${Date.now()}-${
 		withPrivileges ? 'privileged' : 'unprivileged'
-	}}}`;
+	}`;
 	const IPC_CLIENT_ID = `etcher-client-${process.pid}-${Date.now()}-${
 		withPrivileges ? 'privileged' : 'unprivileged'
-	}}`;
+	}`;
 
 	const IPC_SOCKET_ROOT = path.join(
 		process.env.XDG_RUNTIME_DIR || os.tmpdir(),