diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
index 1ab8b8bb26..039c2571b3 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
@@ -82,7 +82,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
 
     ngOnChanges(changes: SimpleChanges) {
         let appId = changes['appId'];
-        if (appId && appId.currentValue) {
+        if (appId && (appId.currentValue || appId.currentValue === null)) {
             this.load();
             return;
         }
@@ -93,7 +93,6 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
      * @param tasks
      */
     private load() {
-        this.resetFilter();
         if (this.appName) {
             this.filterByAppName();
         } else {
@@ -104,6 +103,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
     private filterByAppId(appId) {
         this.activiti.getProcessFilters(appId).subscribe(
             (res: FilterRepresentationModel[]) => {
+                this.resetFilter();
                 res.forEach((filter) => {
                     this.filterObserver.next(filter);
                 });
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
index 8d814fb95b..931e205783 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
@@ -82,7 +82,7 @@ export class ActivitiFilters implements OnInit, OnChanges {
 
     ngOnChanges(changes: SimpleChanges) {
         let appId = changes['appId'];
-        if (appId) {
+        if (appId && (appId.currentValue || appId.currentValue === null)) {
             this.load();
             return;
         }
@@ -93,7 +93,6 @@ export class ActivitiFilters implements OnInit, OnChanges {
      * @param tasks
      */
     private load() {
-        this.resetFilter();
         if (this.appName) {
             this.filterByAppName();
         } else {
@@ -104,6 +103,7 @@ export class ActivitiFilters implements OnInit, OnChanges {
     private filterByAppId(appId) {
         this.activiti.getTaskListFilters(appId).subscribe(
             (res: FilterRepresentationModel[]) => {
+                this.resetFilter();
                 res.forEach((filter) => {
                     this.filterObserver.next(filter);
                     this.selectFirstFilter();