diff --git a/apps/stage-tamagotchi/scripts/utils.ts b/apps/stage-tamagotchi/scripts/utils.ts
index 4f197cc2c..0a4485929 100644
--- a/apps/stage-tamagotchi/scripts/utils.ts
+++ b/apps/stage-tamagotchi/scripts/utils.ts
@@ -137,14 +137,14 @@ export async function getFilenames(target: string, options: { release: boolean,
           target: 'x86_64-pc-windows-msvc',
           extension: 'exe',
           outputFilename: applyTemplateOfArtifactName(
-            electronBuilder.nsis?.artifactName!,
+            electronBuilder.nsis!.artifactName!,
             productName,
             beforeVersion,
             mapArchFor(target, 'exe'),
             'exe',
           ),
           releaseArtifactFilename: applyTemplateOfArtifactName(
-            electronBuilder.nsis?.artifactName!,
+            electronBuilder.nsis!.artifactName!,
             productName,
             version,
             mapArchFor(target, 'exe'),
@@ -334,14 +334,14 @@ export async function getFilenames(target: string, options: { release: boolean,
           target: 'aarch64-apple-darwin',
           extension: 'dmg',
           outputFilename: applyTemplateOfArtifactName(
-            electronBuilder.dmg?.artifactName!,
+            electronBuilder.dmg!.artifactName!,
             productName,
             beforeVersion,
             mapArchFor(target, 'dmg'),
             'dmg',
           ),
           releaseArtifactFilename: applyTemplateOfArtifactName(
-            electronBuilder.dmg?.artifactName!,
+            electronBuilder.dmg!.artifactName!,
             productName,
             version,
             mapArchFor(target, 'dmg'),
@@ -357,14 +357,14 @@ export async function getFilenames(target: string, options: { release: boolean,
           target: 'x86_64-apple-darwin',
           extension: 'dmg',
           outputFilename: applyTemplateOfArtifactName(
-            electronBuilder.dmg?.artifactName!,
+            electronBuilder.dmg!.artifactName!,
             productName,
             beforeVersion,
             mapArchFor(target, 'dmg'),
             'dmg',
           ),
           releaseArtifactFilename: applyTemplateOfArtifactName(
-            electronBuilder.dmg?.artifactName!,
+            electronBuilder.dmg!.artifactName!,
             productName,
             version,
             mapArchFor(target, 'dmg'),
diff --git a/apps/stage-tamagotchi/src/main/index.ts b/apps/stage-tamagotchi/src/main/index.ts
index 9353fdbe2..8738228ed 100644
--- a/apps/stage-tamagotchi/src/main/index.ts
+++ b/apps/stage-tamagotchi/src/main/index.ts
@@ -84,8 +84,10 @@ function setupTray(params: {
     appTray.setContextMenu(contextMenu)
     appTray.setToolTip('Project AIRI')
     appTray.addListener('click', () => toggleWindowShow(params.mainWindow))
+
     // On macOS, there's a special double-click event
-    isMacOS && appTray.addListener('double-click', () => toggleWindowShow(params.mainWindow))
+    if (isMacOS)
+      appTray.addListener('double-click', () => toggleWindowShow(params.mainWindow))
   })()
 }