diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
index 839b54357..276b9cc39 100644
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
@@ -51,6 +51,12 @@
           <option value="false" i18n>False</option>
         </select>
       }
+      @case (CustomFieldQueryOperator.IsNull) {
+        <select class="w-25 form-select rounded-end" [(ngModel)]="query.value" [disabled]="disabled">
+          <option value="true" i18n>True</option>
+          <option value="false" i18n>False</option>
+        </select>
+      }
       @default {
         <input class="w-25 form-control rounded-end" type="text" [(ngModel)]="query.value" [disabled]="disabled">
       }
diff --git a/src-ui/src/app/data/custom-field-query.ts b/src-ui/src/app/data/custom-field-query.ts
index 34c66885a..b4f87d905 100644
--- a/src-ui/src/app/data/custom-field-query.ts
+++ b/src-ui/src/app/data/custom-field-query.ts
@@ -109,15 +109,15 @@ export const CUSTOM_FIELD_QUERY_VALUE_TYPES_BY_OPERATOR = {
   [CustomFieldQueryOperator.IsNull]: 'boolean',
   [CustomFieldQueryOperator.Exists]: 'boolean',
   [CustomFieldQueryOperator.IContains]: 'string',
+  [CustomFieldQueryOperator.GreaterThanOrEqual]: 'string',
+  [CustomFieldQueryOperator.LessThanOrEqual]: 'string',
   // TODO: Implement these
   // [CustomFieldQueryOperator.In]: 'array',
   // [CustomFieldQueryOperator.Contains]: 'string',
   // [CustomFieldQueryOperator.IStartsWith]: 'string',
   // [CustomFieldQueryOperator.IEndsWith]: 'string',
   // [CustomFieldQueryOperator.GreaterThan]: 'number',
-  // [CustomFieldQueryOperator.GreaterThanOrEqual]: 'number',
   // [CustomFieldQueryOperator.LessThan]: 'number',
-  // [CustomFieldQueryOperator.LessThanOrEqual]: 'number',
   // [CustomFieldQueryOperator.Range]: 'array',
 }