diff --git a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
index 7c73d65886..c2352fcb74 100644
--- a/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
+++ b/demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
@@ -105,19 +105,19 @@ export class TaskListDemoComponent implements OnInit, OnDestroy {
     buildForm() {
         this.taskListForm = this.formBuilder.group({
             taskAppId: new UntypedFormControl(this.defaultAppId, [Validators.pattern('^[0-9]*$')]),
-            taskName: new UntypedFormControl(''),
-            taskId: new UntypedFormControl(''),
-            taskProcessDefinitionId: new UntypedFormControl(''),
-            taskProcessInstanceId: new UntypedFormControl(''),
-            taskAssignment: new UntypedFormControl(''),
-            taskState: new UntypedFormControl(''),
-            taskSort: new UntypedFormControl(''),
-            taskSize: new UntypedFormControl('', [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]),
-            taskPage: new UntypedFormControl('', [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]),
-            taskDueAfter: new UntypedFormControl(''),
-            taskDueBefore: new UntypedFormControl(''),
-            taskStart: new UntypedFormControl('', [Validators.pattern('^[0-9]*$')]),
-            taskIncludeProcessInstance: new UntypedFormControl('')
+            taskName: new UntypedFormControl(),
+            taskId: new UntypedFormControl(),
+            taskProcessDefinitionId: new UntypedFormControl(),
+            taskProcessInstanceId: new UntypedFormControl(),
+            taskAssignment: new UntypedFormControl(),
+            taskState: new UntypedFormControl(),
+            taskSort: new UntypedFormControl(),
+            taskSize: new UntypedFormControl(null, [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]),
+            taskPage: new UntypedFormControl(null, [Validators.pattern('^[0-9]*$'), Validators.min(this.minValue)]),
+            taskDueAfter: new UntypedFormControl(),
+            taskDueBefore: new UntypedFormControl(),
+            taskStart: new UntypedFormControl(null, [Validators.pattern('^[0-9]*$')]),
+            taskIncludeProcessInstance: new UntypedFormControl()
         });
 
         this.taskListForm.valueChanges
@@ -142,7 +142,7 @@ export class TaskListDemoComponent implements OnInit, OnDestroy {
         this.state = taskFilter.taskState;
         this.sort = taskFilter.taskSort;
         this.start = taskFilter.taskStart;
-        this.dueAfter = this.setDueAfterFilter(taskFilter.taskDueAfter);
+        this.dueAfter = taskFilter.taskDueAfter ? this.setDueAfterFilter(taskFilter.taskDueAfter) : null;
         this.dueBefore = taskFilter.taskDueBefore;
 
         if (taskFilter.taskSize) {