diff --git a/.changeset/afraid-flies-attack.md b/.changeset/afraid-flies-attack.md
new file mode 100644
index 00000000000..826ff47e99c
--- /dev/null
+++ b/.changeset/afraid-flies-attack.md
@@ -0,0 +1,5 @@
+---
+'@finos/legend-query-builder': patch
+---
+
+Stop defaulting values to derived property/filter/post-filter panel
diff --git a/packages/legend-query-builder/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx b/packages/legend-query-builder/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx
index 8ebe3c5022b..561cd9fc0ea 100644
--- a/packages/legend-query-builder/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx
+++ b/packages/legend-query-builder/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx
@@ -46,12 +46,14 @@ import {
   MoreVerticalIcon,
   MenuContentItemIcon,
   MenuContentItemLabel,
+  ExclamationTriangleIcon,
 } from '@finos/legend-art';
 import {
   type ValueSpecification,
   Class,
   Enumeration,
   PrimitiveType,
+  InstanceValue,
 } from '@finos/legend-graph';
 import {
   assertErrorThrown,
@@ -82,7 +84,10 @@ import {
 } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
-import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
+import {
+  isTypeCompatibleForAssignment,
+  isValidInstanceValue,
+} from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import {
@@ -100,6 +105,7 @@ import {
 } from '../../stores/fetch-structure/tds/window/QueryBuilderWindowState.js';
 import type { QueryBuilderTDSColumnState } from '../../stores/fetch-structure/tds/QueryBuilderTDSColumnState.js';
 import { QueryBuilderTelemetryHelper } from '../../__lib__/QueryBuilderTelemetryHelper.js';
+import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
 
 const QueryBuilderPostFilterConditionContextMenu = observer(
   forwardRef<
@@ -366,6 +372,9 @@ const QueryBuilderPostFilterConditionEditor = observer(
       reloadValues: debouncedTypeaheadSearch,
       cleanUpReloadValues,
     };
+    const isPostFilterValueInValid =
+      node.condition.value instanceof InstanceValue &&
+      !isValidInstanceValue(node.condition.value);
 
     const { showDroppableSuggestion } = useDragLayer((monitor) => ({
       showDroppableSuggestion:
@@ -454,6 +463,11 @@ const QueryBuilderPostFilterConditionEditor = observer(
                     )}
                   />
                 </PanelEntryDropZonePlaceholder>
+                {isPostFilterValueInValid && (
+                  <div className="query-builder-post-filter-tree__condition-node__error--icon">
+                    <ExclamationTriangleIcon />
+                  </div>
+                )}
               </div>
             )}
           </div>
@@ -971,6 +985,11 @@ const QueryBuilderPostFilterPanelContent = observer(
         <div className="panel__header">
           <div className="panel__header__title">
             <div className="panel__header__title__label">post-filter</div>
+            {postFilterState.allValidationIssues.length !== 0 && (
+              <QueryBuilderPanelIssueCountBadge
+                issues={postFilterState.allValidationIssues}
+              />
+            )}
           </div>
           <div className="panel__header__actions">
             <DropdownMenu
diff --git a/packages/legend-query-builder/src/components/filter/QueryBuilderFilterPanel.tsx b/packages/legend-query-builder/src/components/filter/QueryBuilderFilterPanel.tsx
index 134ffad0e47..6ebb9fe2949 100644
--- a/packages/legend-query-builder/src/components/filter/QueryBuilderFilterPanel.tsx
+++ b/packages/legend-query-builder/src/components/filter/QueryBuilderFilterPanel.tsx
@@ -45,6 +45,7 @@ import {
   MoreVerticalIcon,
   MenuContentItemIcon,
   MenuContentItemLabel,
+  ExclamationTriangleIcon,
 } from '@finos/legend-art';
 import {
   type QueryBuilderFilterConditionDragSource,
@@ -72,14 +73,17 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { useApplicationStore } from '@finos/legend-application';
-import type { ValueSpecification } from '@finos/legend-graph';
+import { InstanceValue, type ValueSpecification } from '@finos/legend-graph';
 import {
   type QueryBuilderProjectionColumnDragSource,
   QueryBuilderSimpleProjectionColumnState,
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
 } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderFilterOperator } from '../../stores/filter/QueryBuilderFilterOperator.js';
-import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
+import {
+  isTypeCompatibleForAssignment,
+  isValidInstanceValue,
+} from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import {
   BasicValueSpecificationEditor,
@@ -87,6 +91,7 @@ import {
   QUERY_BUILDER_VARIABLE_DND_TYPE,
 } from '../shared/BasicValueSpecificationEditor.js';
 import { QueryBuilderTelemetryHelper } from '../../__lib__/QueryBuilderTelemetryHelper.js';
+import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
 
 export const IS_DRAGGABLE_FILTER_DND_TYPES_FETCH_SUPPORTED = [
   QUERY_BUILDER_FILTER_DND_TYPE.CONDITION,
@@ -230,8 +235,7 @@ const QueryBuilderFilterConditionEditor = observer(
       isLoading: node.condition.typeaheadSearchState.isInProgress,
       reloadValues: debouncedTypeaheadSearch,
       cleanUpReloadValues,
-    };
-
+    }
     const { showDroppableSuggestion } = useDragLayer((monitor) => ({
       showDroppableSuggestion:
         monitor.isDragging() &&
@@ -240,7 +244,9 @@ const QueryBuilderFilterConditionEditor = observer(
           : IS_DRAGGABLE_FILTER_DND_TYPES
         ).includes(monitor.getItemType()?.toString() ?? ''),
     }));
-
+    const isFilterValueInValid =
+      node.condition.value instanceof InstanceValue &&
+      !isValidInstanceValue(node.condition.value);
     return (
       <div className="query-builder-filter-tree__node__label__content dnd__entry__container">
         {showDroppableSuggestion && (
@@ -323,6 +329,11 @@ const QueryBuilderFilterConditionEditor = observer(
                     )}
                   />
                 </PanelEntryDropZonePlaceholder>
+                {isFilterValueInValid && (
+                  <div className="query-builder-filter-tree__condition-node__error--icon">
+                    <ExclamationTriangleIcon />
+                  </div>
+                )}
               </div>
             )}
           </div>
@@ -906,6 +917,11 @@ export const QueryBuilderFilterPanel = observer(
         <div className="panel__header">
           <div className="panel__header__title">
             <div className="panel__header__title__label">filter</div>
+            {filterState.allValidationIssues.length !== 0 && (
+              <QueryBuilderPanelIssueCountBadge
+                issues={filterState.allValidationIssues}
+              />
+            )}
           </div>
 
           <div className="panel__header__actions">
diff --git a/packages/legend-query-builder/src/components/shared/BasicValueSpecificationEditor.tsx b/packages/legend-query-builder/src/components/shared/BasicValueSpecificationEditor.tsx
index d3ba779f4c6..3730db80d46 100644
--- a/packages/legend-query-builder/src/components/shared/BasicValueSpecificationEditor.tsx
+++ b/packages/legend-query-builder/src/components/shared/BasicValueSpecificationEditor.tsx
@@ -33,6 +33,7 @@ import {
   BasePopover,
   PanelFormSection,
   CalculateIcon,
+  type SelectComponent,
 } from '@finos/legend-art';
 import {
   type Enum,
@@ -67,6 +68,7 @@ import {
   parseCSVString,
   guaranteeIsNumber,
   csvStringify,
+  guaranteeType,
 } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { observer } from 'mobx-react-lite';
@@ -227,6 +229,8 @@ const StringPrimitiveInstanceValueEditor = observer(
       selectorConfig,
       obseverContext,
     } = props;
+    const inputRef = useRef<HTMLInputElement>(null);
+    const selectorRef = useRef<SelectComponent>(null);
     const useSelector = Boolean(selectorConfig);
     const applicationStore = useApplicationStore();
     const value = valueSpecification.values[0] as string;
@@ -277,10 +281,19 @@ const StringPrimitiveInstanceValueEditor = observer(
     const noOptionsMessage =
       selectorConfig?.values === undefined ? (): null => null : undefined;
 
+    useEffect(() => {
+      if (useSelector) {
+        selectorRef.current?.focus();
+      } else {
+        inputRef.current?.focus();
+      }
+    }, [useSelector]);
+
     return (
       <div className={clsx('value-spec-editor', className)}>
         {useSelector ? (
           <CustomSelectorInput
+            ref={selectorRef}
             className="value-spec-editor__enum-selector"
             options={queryOptions}
             onChange={changeValue}
@@ -300,6 +313,7 @@ const StringPrimitiveInstanceValueEditor = observer(
           />
         ) : (
           <input
+            ref={inputRef}
             className="panel__content__form__section__input value-spec-editor__input"
             spellCheck={false}
             value={value}
@@ -380,12 +394,16 @@ const NumberPrimitiveInstanceValueEditor = observer(
       obseverContext,
     } = props;
     const [value, setValue] = useState(
-      (valueSpecification.values[0] as number).toString(),
+      valueSpecification.values[0]
+        ? (valueSpecification.values[0] as number).toString()
+        : '',
     );
     const inputRef = useRef<HTMLInputElement>(null);
-    const numericValue = isInteger
-      ? Number.parseInt(Number(value).toString(), 10)
-      : Number(value);
+    const numericValue = value
+      ? isInteger
+        ? Number.parseInt(Number(value).toString(), 10)
+        : Number(value)
+      : undefined;
 
     const changeValue: React.ChangeEventHandler<HTMLInputElement> = (event) => {
       setValue(event.target.value);
@@ -393,7 +411,7 @@ const NumberPrimitiveInstanceValueEditor = observer(
 
     // Support expression evaluation
     const calculateExpression = (): void => {
-      if (isNaN(numericValue)) {
+      if (value && numericValue && isNaN(numericValue)) {
         try {
           const calculatedValue = guaranteeIsNumber(evaluate(value));
           setValue(
@@ -405,7 +423,7 @@ const NumberPrimitiveInstanceValueEditor = observer(
           setValue((valueSpecification.values[0] as number).toString());
         }
       } else {
-        setValue(numericValue.toString());
+        setValue(numericValue ? numericValue.toString() : '');
       }
     };
 
@@ -419,11 +437,16 @@ const NumberPrimitiveInstanceValueEditor = observer(
     };
 
     useEffect(() => {
-      setValue((valueSpecification.values[0] as number).toString());
+      setValue(
+        valueSpecification.values[0]
+          ? (valueSpecification.values[0] as number).toString()
+          : '',
+      );
     }, [valueSpecification]);
 
     useEffect(() => {
       if (
+        numericValue &&
         !isNaN(numericValue) &&
         numericValue !== valueSpecification.values[0]
       ) {
@@ -434,6 +457,9 @@ const NumberPrimitiveInstanceValueEditor = observer(
           obseverContext,
         );
         setValueSpecification(valueSpecification);
+      } else if (!numericValue) {
+        instanceValue_setValues(valueSpecification, [], obseverContext);
+        setValueSpecification(valueSpecification);
       }
     }, [
       numericValue,
@@ -442,6 +468,10 @@ const NumberPrimitiveInstanceValueEditor = observer(
       obseverContext,
     ]);
 
+    useEffect(() => {
+      inputRef.current?.focus();
+    }, []);
+
     return (
       <div className={clsx('value-spec-editor', className)}>
         <div className="value-spec-editor__number__input-container">
@@ -493,9 +523,13 @@ const EnumValueInstanceValueEditor = observer(
       setValueSpecification,
       obseverContext,
     } = props;
-    const enumValueRef = guaranteeNonNullable(valueSpecification.values[0]);
-    const enumValue = enumValueRef.value;
-    const options = enumValue._OWNER.values.map((value) => ({
+    const selectorRef = useRef<SelectComponent>(null);
+    const enumValueRef = valueSpecification.values[0];
+    const enumValue = enumValueRef?.value;
+    const options = guaranteeType(
+      valueSpecification.genericType?.ownerReference.value,
+      Enumeration,
+    ).values.map((value) => ({
       label: value.name,
       value: value,
     }));
@@ -509,13 +543,18 @@ const EnumValueInstanceValueEditor = observer(
       setValueSpecification(valueSpecification);
     };
 
+    useEffect(() => {
+      selectorRef.current?.focus();
+    }, []);
+
     return (
       <div className={clsx('value-spec-editor', className)}>
         <CustomSelectorInput
+          ref={selectorRef}
           className="value-spec-editor__enum-selector"
           options={options}
           onChange={changeValue}
-          value={{ value: enumValue, label: enumValue.name }}
+          value={enumValue ? { value: enumValue, label: enumValue.name } : null}
           darkMode={true}
         />
         <button
@@ -667,7 +706,7 @@ const CollectionValueInstanceValueEditor = observer(
     } = props;
     const inputRef = useRef<HTMLInputElement>(null);
     const [text, setText] = useState(stringifyValue(valueSpecification.values));
-    const [editable, setEditable] = useState(false);
+    const [editable, setEditable] = useState(true);
     const [showAdvancedEditorPopover, setShowAdvancedEditorPopover] =
       useState(false);
     const valueText = stringifyValue(valueSpecification.values);
diff --git a/packages/legend-query-builder/src/stores/QueryBuilderPropertyEditorState.ts b/packages/legend-query-builder/src/stores/QueryBuilderPropertyEditorState.ts
index fa9e9e62af3..53330e54635 100644
--- a/packages/legend-query-builder/src/stores/QueryBuilderPropertyEditorState.ts
+++ b/packages/legend-query-builder/src/stores/QueryBuilderPropertyEditorState.ts
@@ -26,17 +26,14 @@ import {
 import {
   Class,
   type AbstractProperty,
-  type Enum,
   type ValueSpecification,
   type PureModel,
   AbstractPropertyExpression,
   DerivedProperty,
   Enumeration,
-  EnumValueExplicitReference,
   EnumValueInstanceValue,
   InstanceValue,
   PrimitiveInstanceValue,
-  type PRIMITIVE_TYPE,
   VariableExpression,
   SimpleFunctionExpression,
   matchFunctionName,
@@ -50,7 +47,7 @@ import {
 } from '@finos/legend-graph';
 import {
   createNullishValue,
-  generateDefaultValueForPrimitiveType,
+  isValidInstanceValue,
 } from './QueryBuilderValueSpecificationHelper.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
@@ -58,7 +55,6 @@ import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from './QueryBuilderStateHashUtils
 import {
   propertyExpression_setFunc,
   functionExpression_setParametersValues,
-  instanceValue_setValues,
 } from './shared/ValueSpecificationModifierHelper.js';
 import { generateMilestonedPropertyParameterValue } from './milestoning/QueryBuilderMilestoningHelper.js';
 
@@ -157,28 +153,11 @@ export const generateValueSpecificationForParameter = (
           ),
         ),
       );
-      if (type !== PrimitiveType.LATESTDATE) {
-        instanceValue_setValues(
-          primitiveInstanceValue,
-          [generateDefaultValueForPrimitiveType(type.name as PRIMITIVE_TYPE)],
-          observerContext,
-        );
-      }
       return primitiveInstanceValue;
     } else if (type instanceof Enumeration) {
       const enumValueInstanceValue = new EnumValueInstanceValue(
         GenericTypeExplicitReference.create(new GenericType(type)),
       );
-      if (type.values.length) {
-        const enumValueRef = EnumValueExplicitReference.create(
-          type.values[0] as Enum,
-        );
-        instanceValue_setValues(
-          enumValueInstanceValue,
-          [enumValueRef],
-          observerContext,
-        );
-      }
       return enumValueInstanceValue;
     }
   }
@@ -285,22 +264,7 @@ export class QueryBuilderDerivedPropertyExpressionState {
     // TODO: more type matching logic here (take into account multiplicity, type, etc.)
     return this.parameterValues.every((paramValue) => {
       if (paramValue instanceof InstanceValue) {
-        const isRequired = paramValue.multiplicity.lowerBound >= 1;
-        // required and no values provided. LatestDate doesn't have any values so we skip that check for it.
-        if (
-          isRequired &&
-          paramValue.genericType?.value.rawType !== PrimitiveType.LATESTDATE &&
-          !paramValue.values.length
-        ) {
-          return false;
-        }
-        // more values than allowed
-        if (
-          paramValue.multiplicity.upperBound &&
-          paramValue.values.length > paramValue.multiplicity.upperBound
-        ) {
-          return false;
-        }
+        return isValidInstanceValue(paramValue);
       }
       return true;
     });
diff --git a/packages/legend-query-builder/src/stores/QueryBuilderState.ts b/packages/legend-query-builder/src/stores/QueryBuilderState.ts
index 15630b6cb22..da963ad66f2 100644
--- a/packages/legend-query-builder/src/stores/QueryBuilderState.ts
+++ b/packages/legend-query-builder/src/stores/QueryBuilderState.ts
@@ -644,7 +644,9 @@ export abstract class QueryBuilderState implements CommandRegistrar {
   }
 
   get allValidationIssues(): string[] {
-    return this.fetchStructureState.implementation.allValidationIssues;
+    return this.fetchStructureState.implementation.allValidationIssues.concat(
+      this.filterState.allValidationIssues,
+    );
   }
 
   /**
diff --git a/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts b/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts
index 819b2675fe8..34e541266f8 100644
--- a/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts
+++ b/packages/legend-query-builder/src/stores/QueryBuilderValueSpecificationHelper.ts
@@ -46,6 +46,7 @@ import {
   INTERNAL__PropagatedValue,
   isSubType,
   type ObserverContext,
+  type InstanceValue,
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
@@ -121,6 +122,26 @@ export const getCollectionValueSpecificationType = (
   return undefined;
 };
 
+export const isValidInstanceValue = (value: InstanceValue): boolean => {
+  const isRequired = value.multiplicity.lowerBound >= 1;
+  // required and no values provided. LatestDate doesn't have any values so we skip that check for it.
+  if (
+    isRequired &&
+    value.genericType?.value.rawType !== PrimitiveType.LATESTDATE &&
+    !value.values.length
+  ) {
+    return false;
+  }
+  // more values than allowed
+  if (
+    value.multiplicity.upperBound &&
+    value.values.length > value.multiplicity.upperBound
+  ) {
+    return false;
+  }
+  return true;
+};
+
 export const unwrapNotExpression = (
   expression: SimpleFunctionExpression,
 ): SimpleFunctionExpression | undefined => {
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts
index 3da26fe196c..a62504d1d7f 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts
@@ -274,6 +274,18 @@ export class QueryBuilderTDSState
 
   get fetchStructureValidationIssues(): string[] {
     const validationIssues: string[] = [];
+    this.projectionColumns.forEach((column) => {
+      if (
+        column instanceof QueryBuilderSimpleProjectionColumnState &&
+        column.propertyExpressionState.derivedPropertyExpressionStates.some(
+          (p) => !p.isValid,
+        )
+      ) {
+        validationIssues.push(
+          `Derived property parameter value for ${column.propertyExpressionState.title} is missing`,
+        );
+      }
+    });
     const hasInValidCalendarAggregateColumns =
       this.aggregationState.columns.some(
         (column) =>
@@ -306,6 +318,7 @@ export class QueryBuilderTDSState
     const fetchStructureValidationIssues = [
       ...this.fetchStructureValidationIssues,
       ...this.windowState.windowValidationIssues,
+      ...this.postFilterState.allValidationIssues,
     ];
 
     return fetchStructureValidationIssues;
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts
index 099a94118a8..9d8e7a19bec 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts
@@ -25,6 +25,7 @@ import {
   PRIMITIVE_TYPE,
   observe_ValueSpecification,
   PrimitiveType,
+  InstanceValue,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -60,6 +61,7 @@ import {
   QueryBuilderProjectionColumnState,
   type QueryBuilderProjectionColumnDragSource,
   QueryBuilderDerivationProjectionColumnState,
+  QueryBuilderSimpleProjectionColumnState,
 } from '../projection/QueryBuilderProjectionColumnState.js';
 import {
   buildProjectionColumnTypeaheadQuery,
@@ -70,7 +72,10 @@ import { QUERY_BUILDER_GROUP_OPERATION } from '../../../QueryBuilderGroupOperati
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../QueryBuilderStateHashUtils.js';
 import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
-import { isValueExpressionReferencedInValue } from '../../../QueryBuilderValueSpecificationHelper.js';
+import {
+  isValidInstanceValue,
+  isValueExpressionReferencedInValue,
+} from '../../../QueryBuilderValueSpecificationHelper.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   GROUP_CONDITION = 'GROUP_CONDITION',
@@ -502,6 +507,7 @@ export class QueryBuilderPostFilterState
       expandTree: action,
       replaceBlankNodeWithNode: action,
       setRearrangingConditions: action,
+      allValidationIssues: computed,
       hashCode: computed,
     });
 
@@ -875,6 +881,34 @@ export class QueryBuilderPostFilterState
     );
   }
 
+  get allValidationIssues(): string[] {
+    const validationIssues: string[] = [];
+    Array.from(this.nodes.values()).forEach((node) => {
+      if (node instanceof QueryBuilderPostFilterTreeConditionNodeData) {
+        if (
+          node.condition.value instanceof InstanceValue &&
+          !isValidInstanceValue(node.condition.value) &&
+          node.condition.columnState instanceof
+            QueryBuilderSimpleProjectionColumnState
+        ) {
+          validationIssues.push(
+            `Filter value for ${node.condition.columnState.propertyExpressionState.title} is missing`,
+          );
+        }
+        if (
+          node.condition.columnState instanceof
+            QueryBuilderSimpleProjectionColumnState &&
+          !node.condition.columnState.propertyExpressionState.isValid
+        ) {
+          validationIssues.push(
+            `Derived property parameter value for ${node.condition.columnState.propertyExpressionState.title} is missing`,
+          );
+        }
+      }
+    });
+    return validationIssues;
+  }
+
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.POST_FILTER_STATE,
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts
index 16b37b04d1c..8dd2f0c0704 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts
@@ -36,7 +36,6 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
@@ -78,7 +77,7 @@ export class QueryBuilderPostFilterOperator_Contain
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts
index 2ad3c79f6e0..48d1e8b3e51 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts
@@ -34,7 +34,6 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
@@ -74,7 +73,7 @@ export class QueryBuilderPostFilterOperator_EndWith
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts
index 04c54feab10..3da83ad1acd 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts
@@ -17,12 +17,10 @@
 import {
   type Type,
   type ValueSpecification,
-  type Enum,
   type SimpleFunctionExpression,
   type FunctionExpression,
   AbstractPropertyExpression,
   Enumeration,
-  EnumValueExplicitReference,
   EnumValueInstanceValue,
   GenericType,
   GenericTypeExplicitReference,
@@ -42,7 +40,6 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
@@ -51,7 +48,6 @@ import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOper
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
-import { instanceValue_setValues } from '../../../../shared/ValueSpecificationModifierHelper.js';
 
 export class QueryBuilderPostFilterOperator_Equal
   extends QueryBuilderPostFilterOperator
@@ -115,7 +111,7 @@ export class QueryBuilderPostFilterOperator_Equal
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
@@ -125,7 +121,7 @@ export class QueryBuilderPostFilterOperator_Equal
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
@@ -138,16 +134,6 @@ export class QueryBuilderPostFilterOperator_Equal
                 new GenericType(propertyType),
               ),
             );
-            instanceValue_setValues(
-              enumValueInstanceValue,
-              [
-                EnumValueExplicitReference.create(
-                  propertyType.values[0] as Enum,
-                ),
-              ],
-              postFilterConditionState.postFilterState.tdsState
-                .queryBuilderState.observerContext,
-            );
             return enumValueInstanceValue;
           }
           throw new UnsupportedOperationError(
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts
index 7f7b03e615c..ae20cca7d54 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts
@@ -34,7 +34,6 @@ import type {
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
@@ -93,7 +92,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
@@ -103,7 +102,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts
index d50c5e34d12..9a7313222b1 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts
@@ -34,7 +34,6 @@ import type {
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
@@ -93,7 +92,7 @@ export class QueryBuilderPostFilterOperator_LessThan
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
@@ -103,7 +102,7 @@ export class QueryBuilderPostFilterOperator_LessThan
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
diff --git a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts
index 68add559363..ad0d0d8bfbb 100644
--- a/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts
+++ b/packages/legend-query-builder/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts
@@ -35,7 +35,6 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
@@ -75,7 +74,7 @@ export class QueryBuilderPostFilterOperator_StartWith
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
         );
diff --git a/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterState.ts b/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterState.ts
index 8ec55ede0d1..911bec1fc0e 100644
--- a/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterState.ts
+++ b/packages/legend-query-builder/src/stores/filter/QueryBuilderFilterState.ts
@@ -42,6 +42,7 @@ import {
   type ValueSpecification,
   type VariableExpression,
   observe_ValueSpecification,
+  InstanceValue,
 } from '@finos/legend-graph';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilderConfig.js';
 import type { QueryBuilderProjectionColumnDragSource } from '../fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
@@ -53,7 +54,10 @@ import {
 import type { QueryBuilderFilterOperator } from './QueryBuilderFilterOperator.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../QueryBuilderGroupOperationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtils.js';
-import { isValueExpressionReferencedInValue } from '../QueryBuilderValueSpecificationHelper.js';
+import {
+  isValidInstanceValue,
+  isValueExpressionReferencedInValue,
+} from '../QueryBuilderValueSpecificationHelper.js';
 
 export enum QUERY_BUILDER_FILTER_DND_TYPE {
   GROUP_CONDITION = 'GROUP_CONDITION',
@@ -406,6 +410,7 @@ export class QueryBuilderFilterState
       collapseTree: action,
       setShowPanel: action,
       expandTree: action,
+      allValidationIssues: computed,
       hashCode: computed,
     });
 
@@ -795,6 +800,28 @@ export class QueryBuilderFilterState
     );
   }
 
+  get allValidationIssues(): string[] {
+    const validationIssues: string[] = [];
+    Array.from(this.nodes.values()).forEach((node) => {
+      if (node instanceof QueryBuilderFilterTreeConditionNodeData) {
+        if (
+          node.condition.value instanceof InstanceValue &&
+          !isValidInstanceValue(node.condition.value)
+        ) {
+          validationIssues.push(
+            `Filter value for ${node.condition.propertyExpressionState.title} is missing`,
+          );
+        }
+        if (!node.condition.propertyExpressionState.isValid) {
+          validationIssues.push(
+            `Derived property parameter value for ${node.condition.propertyExpressionState.title} is missing`,
+          );
+        }
+      }
+    });
+    return validationIssues;
+  }
+
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_STATE,
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts
index bd45d498c70..63eade09b5e 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts
@@ -36,7 +36,6 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -83,7 +82,7 @@ export class QueryBuilderFilterOperator_Contain
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts
index 61fd6843211..fdfd2bd571f 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts
@@ -36,7 +36,6 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -83,7 +82,7 @@ export class QueryBuilderFilterOperator_EndWith
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts
index 5cc8d90784d..0e4739f7e22 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts
@@ -22,12 +22,10 @@ import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type Enum,
   type AbstractPropertyExpression,
   EnumValueInstanceValue,
   GenericTypeExplicitReference,
   GenericType,
-  EnumValueExplicitReference,
   Enumeration,
   PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
@@ -43,14 +41,12 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
-import { instanceValue_setValues } from '../../shared/ValueSpecificationModifierHelper.js';
 
 export class QueryBuilderFilterOperator_Equal
   extends QueryBuilderFilterOperator
@@ -116,7 +112,7 @@ export class QueryBuilderFilterOperator_Equal
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
@@ -125,7 +121,7 @@ export class QueryBuilderFilterOperator_Equal
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
@@ -137,16 +133,6 @@ export class QueryBuilderFilterOperator_Equal
                 new GenericType(propertyType),
               ),
             );
-            instanceValue_setValues(
-              enumValueInstanceValue,
-              [
-                EnumValueExplicitReference.create(
-                  propertyType.values[0] as Enum,
-                ),
-              ],
-              filterConditionState.filterState.queryBuilderState
-                .observerContext,
-            );
             return enumValueInstanceValue;
           }
           throw new UnsupportedOperationError(
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts
index 68d86856d5b..29fdff19951 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts
@@ -36,7 +36,6 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -99,7 +98,7 @@ export class QueryBuilderFilterOperator_GreaterThan
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
@@ -108,7 +107,7 @@ export class QueryBuilderFilterOperator_GreaterThan
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts
index 02e9d1b4181..f388006e03b 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts
@@ -36,7 +36,6 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -99,7 +98,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
@@ -108,7 +107,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts
index 480821095fe..519cc103596 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts
@@ -36,7 +36,6 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -99,7 +98,7 @@ export class QueryBuilderFilterOperator_LessThan
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
@@ -108,7 +107,7 @@ export class QueryBuilderFilterOperator_LessThan
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts
index e83ea54eaba..985cc322f20 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts
@@ -36,7 +36,6 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -99,7 +98,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
@@ -108,7 +107,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts
index e227f381170..2ab52b6244e 100644
--- a/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts
+++ b/packages/legend-query-builder/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts
@@ -37,7 +37,6 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -83,7 +82,7 @@ export class QueryBuilderFilterOperator_StartWith
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
           propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          undefined,
           filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
diff --git a/packages/legend-query-builder/src/stores/shared/ValueSpecificationEditorHelper.ts b/packages/legend-query-builder/src/stores/shared/ValueSpecificationEditorHelper.ts
index 11d597f0bb9..53712f3a5d0 100644
--- a/packages/legend-query-builder/src/stores/shared/ValueSpecificationEditorHelper.ts
+++ b/packages/legend-query-builder/src/stores/shared/ValueSpecificationEditorHelper.ts
@@ -119,7 +119,7 @@ export const createMockEnumerationProperty = (
 export const buildPrimitiveInstanceValue = (
   graph: PureModel,
   type: PRIMITIVE_TYPE,
-  value: unknown,
+  value: unknown | undefined,
   observerContext: ObserverContext,
 ): PrimitiveInstanceValue => {
   const instance = new PrimitiveInstanceValue(
@@ -127,7 +127,9 @@ export const buildPrimitiveInstanceValue = (
       new GenericType(graph.getPrimitiveType(type)),
     ),
   );
-  instanceValue_setValues(instance, [value], observerContext);
+  if (value) {
+    instanceValue_setValues(instance, [value], observerContext);
+  }
   return instance;
 };
 
diff --git a/packages/legend-query-builder/style/_query-builder-filter.scss b/packages/legend-query-builder/style/_query-builder-filter.scss
index 5ca3b81d19e..a75179ecda4 100644
--- a/packages/legend-query-builder/style/_query-builder-filter.scss
+++ b/packages/legend-query-builder/style/_query-builder-filter.scss
@@ -247,5 +247,13 @@
       font-size: 1.2rem;
       font-weight: 500;
     }
+
+    &__error--icon {
+      @include flexCenter;
+
+      height: 100%;
+      width: 2.8rem;
+      color: var(--color-red-200);
+    }
   }
 }
diff --git a/packages/legend-query-builder/style/_query-builder-post-filter.scss b/packages/legend-query-builder/style/_query-builder-post-filter.scss
index 8c820b044fc..605ac16cfed 100644
--- a/packages/legend-query-builder/style/_query-builder-post-filter.scss
+++ b/packages/legend-query-builder/style/_query-builder-post-filter.scss
@@ -251,6 +251,14 @@
       font-size: 1.2rem;
       font-weight: 500;
     }
+
+    &__error--icon {
+      @include flexCenter;
+
+      height: 100%;
+      width: 2.8rem;
+      color: var(--color-red-200);
+    }
   }
 }