diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index 6e0d311dff..c90cdafb16 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
@@ -387,13 +387,8 @@ export class DataGridContextMenuFilterService {
           const { model, resultIndex, key } = context.data;
           const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
           const data = model.source.getAction(resultIndex, ResultSetDataAction);
-          const columnPosition = data.getColumn(key.column)?.position;
-
-          if (columnPosition === undefined) {
-            return true;
-          }
-
-          const currentConstraint = constraints.get(columnPosition);
+          const resultColumn = data.getColumn(key.column);
+          const currentConstraint = resultColumn ? constraints.get(resultColumn.position) : undefined;
 
           return !currentConstraint || !isFilterConstraint(currentConstraint);
         },
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
index 3f873a1bad..fd16d71656 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
@@ -78,13 +78,9 @@ export class DataGridContextMenuOrderService {
           const { model, resultIndex, key } = context.data;
           const data = model.source.getAction(resultIndex, ResultSetDataAction);
           const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const columnPosition = data.getColumn(key.column)?.position;
+          const resultColumn = data.getColumn(key.column);
 
-          if (columnPosition === undefined) {
-            return false;
-          }
-
-          return constraints.getOrder(columnPosition) === EOrder.asc;
+          return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.asc;
         },
       }
     );
@@ -105,13 +101,9 @@ export class DataGridContextMenuOrderService {
           const { model, resultIndex, key } = context.data;
           const data = model.source.getAction(resultIndex, ResultSetDataAction);
           const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const columnPosition = data.getColumn(key.column)?.position;
+          const resultColumn = data.getColumn(key.column);
 
-          if (columnPosition === undefined) {
-            return false;
-          }
-
-          return constraints.getOrder(columnPosition) === EOrder.desc;
+          return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.desc;
         },
       }
     );
@@ -132,13 +124,9 @@ export class DataGridContextMenuOrderService {
           const { model, resultIndex, key } = context.data;
           const data = model.source.getAction(resultIndex, ResultSetDataAction);
           const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
-          const columnPosition = data.getColumn(key.column)?.position;
+          const resultColumn = data.getColumn(key.column);
 
-          if (columnPosition === undefined) {
-            return false;
-          }
-
-          return constraints.getOrder(columnPosition) === null;
+          return !!resultColumn && constraints.getOrder(resultColumn.position) === null;
         },
       }
     );