diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts
index e1c93f703c..b7e2086c00 100644
--- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts
@@ -836,6 +836,39 @@ describe('EditProcessFilterCloudComponent', () => {
             component.onFilterChange();
         });
 
+        it('should set date range filter type when range is selected', (done) => {
+            component.appName = 'fake';
+            component.filterProperties = ['appName', 'processInstanceId', 'priority', 'completedDateRange'];
+            const taskFilterIdChange = new SimpleChange(undefined, 'mock-task-filter-id', true);
+            component.ngOnChanges({ 'id': taskFilterIdChange });
+            fixture.detectChanges();
+
+            const dateFilter = {
+                startDate: moment().startOf('day').toISOString(true),
+                endDate: moment().endOf('day').toISOString(true)
+            };
+
+            component.onDateRangeFilterChanged(dateFilter, {
+                key: 'completedDateRange',
+                label: '',
+                type: 'date-range',
+                value: '',
+                attributes: {
+                    dateType: 'completedDateType',
+                    from: '_completedFrom',
+                    to: '_completedTo'
+                }
+            });
+
+            fixture.detectChanges();
+            component.filterChange.subscribe(() => {
+                const completedDateTypeControl: AbstractControl = component.editProcessFilterForm.get('completedDateType');
+                expect(completedDateTypeControl.value).toEqual(DateCloudFilterType.RANGE);
+                done();
+            });
+            component.onFilterChange();
+        });
+
         it('should set the correct started date range when date range option is changed', (done) => {
             component.appName = 'fake';
             component.filterProperties = ['appName', 'processInstanceId', 'priority', 'completedDateRange'];
diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts
index 4aea368e55..7785a36d88 100644
--- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts
@@ -346,6 +346,7 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
         this.editProcessFilterForm.get(property.attributes?.to).setValue(
             dateRange.endDate ? dateRange.endDate : null
         );
+        this.editProcessFilterForm.get(property.attributes.dateType).setValue(DateCloudFilterType.RANGE);
     }
 
     onChangedUser(users: IdentityUserModel[], processProperty: ProcessFilterProperties) {