diff --git a/demo-shell-ng2/src/app/components/files/files.component.html b/demo-shell-ng2/src/app/components/files/files.component.html
index edee65b7cd..14c272ecc8 100644
--- a/demo-shell-ng2/src/app/components/files/files.component.html
+++ b/demo-shell-ng2/src/app/components/files/files.component.html
@@ -51,8 +51,8 @@
                         <mat-icon>delete</mat-icon>
                     </button>
                     <button mat-icon-button
+                            [disabled]="!documentList.selection.length"
                             #favorite="adfFavorite"
-                            (toggle)="documentList.reload()"
                             [adf-node-favorite]="documentList.selection">
                         <mat-icon>
                             {{ favorite.hasFavorites() ? 'star' :'star_border' }}
diff --git a/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.spec.ts b/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.spec.ts
index b645c6137b..d128509820 100644
--- a/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.spec.ts
@@ -92,6 +92,25 @@ describe('NodeFavoriteDirective', () => {
 
             expect(directiveInstance.markFavoritesNodes).toHaveBeenCalledWith(component.selection);
         });
+
+        it('should reset favorites if selection is empty', fakeAsync(() => {
+            spyOn(favoritesApi, 'getFavorite').and.returnValue(Promise.resolve());
+
+            component.selection = [
+                { entry: { id: '1', name: 'name1' } }
+            ];
+
+            fixture.detectChanges();
+            tick();
+
+            expect(directiveInstance.hasFavorites()).toBe(true);
+
+            component.selection = [];
+            fixture.detectChanges();
+            tick();
+
+            expect(directiveInstance.hasFavorites()).toBe(false);
+        }));
     });
 
     describe('markFavoritesNodes()', () => {
@@ -267,6 +286,32 @@ describe('NodeFavoriteDirective', () => {
 
             expect(component.done).toHaveBeenCalled();
         }));
+
+        it('should set isFavorites items to false', fakeAsync(() => {
+            removeFavoriteSpy.and.returnValue(Promise.resolve());
+
+            directiveInstance.favorites = [
+                { entry: { id: '1', name: 'name1', isFavorite: true } }
+            ];
+
+            element.triggerEventHandler('click', null);
+            tick();
+
+            expect(directiveInstance.hasFavorites()).toBe(false);
+        }));
+
+        it('should set isFavorites items to true', fakeAsync(() => {
+            addFavoriteSpy.and.returnValue(Promise.resolve());
+
+            directiveInstance.favorites = [
+                { entry: { id: '1', name: 'name1', isFavorite: false } }
+            ];
+
+            element.triggerEventHandler('click', null);
+            tick();
+
+            expect(directiveInstance.hasFavorites()).toBe(true);
+        }));
     });
 
     describe('getFavorite()', () => {
@@ -297,35 +342,6 @@ describe('NodeFavoriteDirective', () => {
         }));
     });
 
-    describe('reset()', () => {
-        beforeEach(() => {
-            spyOn(favoritesApi, 'removeFavoriteSite').and.returnValue(Promise.resolve());
-            spyOn(favoritesApi, 'addFavorite').and.returnValue(Promise.resolve());
-        });
-
-        it('should reset favorite collection after removeFavoriteSite()', fakeAsync(() => {
-            directiveInstance.favorites = [
-                { entry: { id: '1', name: 'name1', isFavorite: true } }
-            ];
-
-            element.triggerEventHandler('click', null);
-            tick();
-
-            expect(directiveInstance.favorites.length).toBe(0);
-        }));
-
-        it('should reset favorite collection after addFavorite()', fakeAsync(() => {
-            directiveInstance.favorites = [
-                { entry: { id: '1', name: 'name1', isFavorite: false } }
-            ];
-
-            element.triggerEventHandler('click', null);
-            tick();
-
-            expect(directiveInstance.favorites.length).toBe(0);
-        }));
-    });
-
     describe('hasFavorites()', () => {
         it('should return false when favorites collection is empty', () => {
             directiveInstance.favorites = [];
diff --git a/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.ts b/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.ts
index a652cd0c84..34e88011e8 100644
--- a/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.ts
+++ b/ng2-components/ng2-alfresco-core/src/directives/node-favorite.directive.ts
@@ -41,6 +41,8 @@ export class NodeFavoriteDirective implements OnChanges {
 
     ngOnChanges(changes) {
         if (!changes.selection.currentValue.length) {
+            this.favorites = [];
+
             return;
         }
 
@@ -63,7 +65,7 @@ export class NodeFavoriteDirective implements OnChanges {
             });
 
             Observable.forkJoin(batch).subscribe(() => {
-                this.reset();
+                this.favorites.map(selected => selected.entry.isFavorite = false);
                 this.toggle.emit();
             });
         }
@@ -74,14 +76,14 @@ export class NodeFavoriteDirective implements OnChanges {
 
             Observable.fromPromise(this.alfrescoApiService.getInstance().core.favoritesApi.addFavorite('-me-', <any> body))
                 .subscribe(() => {
-                    this.reset();
+                    notFavorite.map(selected => selected.entry.isFavorite = true);
                     this.toggle.emit();
                 });
         }
     }
 
     markFavoritesNodes(selection: MinimalNodeEntity[]) {
-        if (selection.length < this.favorites.length) {
+        if (selection.length <= this.favorites.length) {
             const newFavorites = this.reduce(this.favorites, selection);
             this.favorites = newFavorites;
         }
@@ -100,10 +102,6 @@ export class NodeFavoriteDirective implements OnChanges {
         return this.favorites.every((selected) => selected.entry.isFavorite);
     }
 
-    private reset() {
-        this.favorites = [];
-    }
-
     private getProcessBatch(selection): any[] {
         return selection.map((selected: MinimalNodeEntity) => this.getFavorite(selected));
     }