diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
index 18395008d0..33da972d56 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
@@ -8,14 +8,16 @@
     (executeRowAction)="onExecuteRowAction($event)"
     (rowClick)="onRowClick($event)"
     (rowDblClick)="onRowDblClick($event)">
-    <no-content-template>
-        <template>
-            <div class="document-list_empty_template">
-                <div class="document-list__this-space-is-empty">This folder is empty</div>
-                <div class="document-list__drag-drop">Drag and Drop</div>
-                <div class="document-list__any-files-here-to-add">any files here to add</div>
-                <img [src]="baseComponentPath + '/img/empty_doc_lib.svg'" class="document-list__empty_doc_lib">
-            </div>
-        </template>
-    </no-content-template>
+    <div *ngIf="!isEmptyTemplateDefined()">
+        <no-content-template>
+            <template>
+                <div class="document-list_empty_template">
+                    <div class="document-list__this-space-is-empty">This folder is empty</div>
+                    <div class="document-list__drag-drop">Drag and Drop</div>
+                    <div class="document-list__any-files-here-to-add">any files here to add</div>
+                    <img [src]="baseComponentPath + '/img/empty_doc_lib.svg'" class="document-list__empty_doc_lib">
+                </div>
+            </template>
+        </no-content-template>
+    </div>
 </alfresco-datatable>
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index fb75acfbcf..4752b5c370 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -22,7 +22,6 @@ import {
     Output,
     EventEmitter,
     AfterContentInit,
-    AfterViewInit,
     AfterViewChecked,
     TemplateRef,
     NgZone,
@@ -63,7 +62,7 @@ declare let __moduleName: string;
     providers: [DocumentListService],
     directives: [CONTEXT_MENU_DIRECTIVES, ALFRESCO_DATATABLE_DIRECTIVES]
 })
-export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, AfterContentInit {
+export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit {
 
     static SINGLE_CLICK_NAVIGATION: string = 'click';
     static DOUBLE_CLICK_NAVIGATION: string = 'dblclick';
@@ -201,12 +200,13 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
         }
     }
 
-    ngAfterViewInit() {
+    isEmptyTemplateDefined() {
         if (this.dataTable) {
             if (this.emptyFolderTemplate) {
-                this.dataTable.noContentTemplate = this.emptyFolderTemplate;
+                return true;
             }
         }
+        return false;
     }
 
     ngAfterViewChecked() {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts
index fe95d04679..cb55c97fec 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts
@@ -19,7 +19,6 @@ import {
     Directive,
     ContentChild,
     TemplateRef,
-    OnInit,
     AfterContentInit
 } from '@angular/core';
 import { DocumentList } from './document-list';
@@ -27,19 +26,16 @@ import { DocumentList } from './document-list';
 @Directive({
     selector: 'empty-folder-content'
 })
-export class EmptyFolderContent implements OnInit, AfterContentInit {
+export class EmptyFolderContent implements AfterContentInit {
 
     @ContentChild(TemplateRef)
     template: any;
 
-    constructor(
-        private documentList: DocumentList) {
-    }
-
-    ngOnInit() {
+    constructor(private documentList: DocumentList) {
     }
 
     ngAfterContentInit() {
         this.documentList.emptyFolderTemplate = this.template;
+        this.documentList.dataTable.noContentTemplate = this.template;
     }
 }