diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
index 1b2104240e..a1c1b0508c 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
@@ -63,6 +63,7 @@ import { matIconRegistryMock } from '../../testing/mat-icon-registry-mock';
 import { domSanitizerMock } from '../../testing/dom-sanitizer-mock';
 import { MatDialog } from '@angular/material/dialog';
 import { FileAutoDownloadComponent } from './file-auto-download/file-auto-download.component';
+import { ShareDataTableAdapter } from '../public-api';
 
 const mockDialog = {
     open: jasmine.createSpy('open')
@@ -278,6 +279,15 @@ describe('DocumentList', () => {
         expect(documentList.selection).toEqual([]);
     });
 
+    it('should show the header when there are no records in the table but filter is active', () => {
+        documentList.data = new ShareDataTableAdapter(thumbnailService, contentService, []);
+        documentList.filterValue =  { $thumbnail: 'TYPE:"cm:folder"' };
+
+        fixture.detectChanges();
+
+        expect(documentList.showHeader).toEqual('always');
+    });
+
     it('should reloadWithoutResettingSelection not reset the selection', () => {
         documentList.selection = [{ entry: mockNode3 }];
         documentList.reloadWithoutResettingSelection();
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts
index 9b2cac6a27..288db39d80 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts
@@ -236,6 +236,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     /** @hidden */
     @Input()
     _rowFilter: RowFilter | null = null;
+    documentList: any[];
 
     /**
      * Custom function to choose whether to show or hide rows.
@@ -451,7 +452,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
             .subscribe(val => this.contextActionCallback(val));
 
         this.enforceSingleClickNavigationForMobile();
-        if (Object.keys(this.filterValue).length > 0) {
+        if (this.filterValue && Object.keys(this.filterValue).length > 0) {
             this.showHeader = ShowHeaderMode.Always;
         }
     }