diff --git a/src/main/libs/AntaresCore.js b/src/main/libs/AntaresCore.js
index befc1492..a21d7326 100644
--- a/src/main/libs/AntaresCore.js
+++ b/src/main/libs/AntaresCore.js
@@ -140,7 +140,7 @@ export class AntaresCore {
     * @returns {Promise}
     * @memberof AntaresCore
     */
-   async run (args) {
+   run (args) {
       const rawQuery = this.getSQL();
       this._resetQuery();
       return this.raw(rawQuery, args);
diff --git a/src/renderer/components/WorkspaceQueryTableRow.vue b/src/renderer/components/WorkspaceQueryTableRow.vue
index 2a485b9f..a7efacac 100644
--- a/src/renderer/components/WorkspaceQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceQueryTableRow.vue
@@ -10,7 +10,7 @@
       >
          <template v-if="cKey !== '_id'">
             <span
-               v-if="!isInlineEditor[cKey]"
+               v-if="!isInlineEditor[cKey] && fields[cKey]"
                class="cell-content px-2"
                :class="`${isNull(col)} ${typeClass(fields[cKey].type)}`"
                @dblclick="editON($event, col, cKey)"
@@ -348,7 +348,7 @@ export default {
          return false;
       },
       enumArray () {
-         if (this.fields[this.editingField].enumValues)
+         if (this.fields[this.editingField] && this.fields[this.editingField].enumValues)
             return this.fields[this.editingField].enumValues.replaceAll('\'', '').split(',');
          return false;
       }