diff --git a/src/qqq/pages/records/query/RecordQuery.tsx b/src/qqq/pages/records/query/RecordQuery.tsx
index 2b57895..31e8d63 100644
--- a/src/qqq/pages/records/query/RecordQuery.tsx
+++ b/src/qqq/pages/records/query/RecordQuery.tsx
@@ -905,9 +905,9 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
       // that a backend query cannot be made because of missing values for that expression           //
       /////////////////////////////////////////////////////////////////////////////////////////////////
       setWarningAlert(null);
-      for (var i = 0; i < queryFilter?.criteria.length; i++)
+      for (var i = 0; i < queryFilter?.criteria?.length; i++)
       {
-         for (var j = 0; j < queryFilter?.criteria[i].values.length; j++)
+         for (var j = 0; j < queryFilter?.criteria[i]?.values?.length; j++)
          {
             const value = queryFilter.criteria[i].values[j];
             if (value?.type == "FilterVariableExpression")