diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
index bf02fa0a36..84963063c3 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
@@ -975,8 +975,10 @@ describe('DocumentList', () => {
 
     it('should reset pagination when switching sources', () => {
         spyOn(documentList, 'resetPagination').and.callThrough();
-        documentList.loadFolderByNodeId('-trashcan-');
-        documentList.loadFolderByNodeId('-sites-');
+
+        documentList.ngOnChanges({currentFolderId: new SimpleChange(null, '-trashcan-', false)});
+        documentList.ngOnChanges({currentFolderId: new SimpleChange(null, '-sites-', false)});
+
         expect(documentList.resetPagination).toHaveBeenCalledTimes(2);
     });
 });
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
index 50ac487412..afb7e585a0 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
@@ -242,6 +242,9 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
         if (changes.folderNode && changes.folderNode.currentValue) {
             this.loadFolder();
         } else if (changes.currentFolderId && changes.currentFolderId.currentValue) {
+            if (changes.currentFolderId.previousValue !== changes.currentFolderId.currentValue) {
+                this.resetPagination();
+            }
             if (!this.hasCustomLayout) {
                 this.setupDefaultColumns(changes.currentFolderId.currentValue);
             }
@@ -404,9 +407,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
     // gets folder node and its content
     loadFolderByNodeId(nodeId: string) {
         this.loading = true;
-
         this.resetSelection();
-        this.resetPagination();
 
         if (nodeId === '-trashcan-') {
             this.loadTrashcan();
@@ -423,6 +424,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
                 .getFolderNode(nodeId).then(node => {
                     this.folderNode = node;
                     this.currentFolderId = node.id;
+                    this.skipCount = 0;
                     this.currentNodeAllowableOperations = node['allowableOperations'] ? node['allowableOperations'] : [];
                     this.loadFolderNodesByFolderNodeId(node.id, this.pageSize, this.skipCount).catch(err => this.error.emit(err));
                 })