diff --git a/scripts/devtoolsInstaller.js b/scripts/devtoolsInstaller.js
index 16b6bb5b..3af8068e 100644
--- a/scripts/devtoolsInstaller.js
+++ b/scripts/devtoolsInstaller.js
@@ -1,4 +1,5 @@
-// @ts-check
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 const fs = require('fs');
 const path = require('path');
 const https = require('https');
diff --git a/src/main/libs/ShortcutRegister.ts b/src/main/libs/ShortcutRegister.ts
index 6a111cc5..7c2a8f09 100644
--- a/src/main/libs/ShortcutRegister.ts
+++ b/src/main/libs/ShortcutRegister.ts
@@ -19,9 +19,9 @@ export class ShortcutRegister {
    private _mode: ShortcutMode;
    private static _instance: ShortcutRegister;
 
-   private constructor (args: { mainWindow: BrowserWindow; menuTemplate: OsMenu; mode: ShortcutMode }) {
+   private constructor (args: { mainWindow: BrowserWindow; menuTemplate?: OsMenu; mode: ShortcutMode }) {
       this._mainWindow = args.mainWindow;
-      this._menuTemplate = args.menuTemplate;
+      this._menuTemplate = args.menuTemplate || {};
       this._mode = args.mode;
       this.shortcuts = shortcutsStore.get('shortcuts', defaultShortcuts) as ShortcutRecord[];
    }
diff --git a/src/renderer/components/WorkspaceTabQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue
index c1d9733d..defcd351 100644
--- a/src/renderer/components/WorkspaceTabQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -377,7 +377,7 @@ const deleteSelected = () => {
    });
 
    const params = {
-      primary: primaryField.value.name,
+      primary: primaryField.value?.name,
       schema: getSchema(resultsetIndex.value),
       table: getTable(resultsetIndex.value),
       rows
@@ -389,7 +389,7 @@ const setNull = () => {
    const row = localResults.value.find((row: any) => selectedRows.value.includes(row._antares_id));
 
    const params = {
-      primary: primaryField.value.name,
+      primary: primaryField.value?.name,
       schema: getSchema(resultsetIndex.value),
       table: getTable(resultsetIndex.value),
       id: getPrimaryValue(row),