diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js
index 07a9a32d2..94508b0dd 100644
--- a/ui/desktop/electron-app/src/index.js
+++ b/ui/desktop/electron-app/src/index.js
@@ -200,7 +200,7 @@ app.on('before-quit', (event) => {
         case 0:
           sessionManager.stopAll();
           break;
-        case 1:
+        default:
           event.preventDefault();
           break;
       }
diff --git a/ui/desktop/electron-app/src/models/session-manager.js b/ui/desktop/electron-app/src/models/session-manager.js
index 3bcd7938f..b6e0d0939 100644
--- a/ui/desktop/electron-app/src/models/session-manager.js
+++ b/ui/desktop/electron-app/src/models/session-manager.js
@@ -31,7 +31,7 @@ class SessionManager {
    */
   stopById(session_id) {
     const session = this.#sessions.find((session) => session.id === session_id);
-    return session && session.stop();
+    return session?.stop?.();
   }
 
   stopAll() {