diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index bf5e0e3b11..fda209eb2e 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -72,24 +72,26 @@
                             (taskDeleted)="onTaskDeleted($event)">
                         </activiti-task-details>
                         <hr>
-                        <h5>Attachments</h5>
-                        <div class="adf-no-form-container">
-                            <div class="action-header">
-                                <button class="mdl-button mdl-js-button" (click)="toggleCreateTakAttach()">
-                                    Attach Document
-                                    <i class="material-icons">add</i>
-                                </button>
-                            </div>
-                            <adf-task-attachment-list #taskAttach
-                                                      *ngIf="currentTaskId"
-                                                      [taskId]="currentTaskId"
-                                                      (attachmentClick)="onAttachmentClick($event)">
-                            </adf-task-attachment-list>
-                            <div *ngIf="isCreateTaskAttachVisible()">
-                                <adf-create-task-attachment *ngIf="currentTaskId"
-                                                            [taskId]="currentTaskId"
-                                                            (success)="onCreateTaskSuccess()">
-                                </adf-create-task-attachment>
+                        <div id="attachment-task-list" *ngIf="currentTaskId">
+                            <h5>Attachments</h5>
+                            <div class="adf-no-form-container">
+                                <div class="action-header">
+                                    <button [attr.disabled]="isTaskCompleted()" class="mdl-button mdl-js-button" (click)="toggleCreateTakAttach()">
+                                        Attach Document
+                                        <i class="material-icons">add</i>
+                                    </button>
+                                </div>
+                                <adf-task-attachment-list #taskAttach
+                                                          *ngIf="currentTaskId"
+                                                          [taskId]="currentTaskId"
+                                                          (attachmentClick)="onAttachmentClick($event)">
+                                </adf-task-attachment-list>
+                                <div *ngIf="isCreateTaskAttachVisible()">
+                                    <adf-create-task-attachment *ngIf="currentTaskId"
+                                                                [taskId]="currentTaskId"
+                                                                (success)="onCreateTaskSuccess()">
+                                    </adf-create-task-attachment>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -154,22 +156,24 @@
                                 (taskClick)="onProcessDetailsTaskClick($event)">
                             </activiti-process-instance-details>
                             <hr>
+                            <div id="attachment-process-list" *ngIf="currentProcessInstanceId">
                             <h5>Attachments</h5>
-                            <div class="action-header">
-                                <button id="show_process_attach" class="mdl-button mdl-js-button" (click)="toggleCreateProcessAttach()">
-                                    Attach Document
-                                    <i class="material-icons">add</i>
-                                </button>
-                            </div>
-                            <adf-process-attachment-list *ngIf="currentProcessInstanceId"
-                                                      [processInstanceId]="currentProcessInstanceId"
-                                                      (attachmentClick)="onAttachmentClick($event)">
-                            </adf-process-attachment-list>
-                            <div *ngIf="isCreateProcessAttachVisible()">
-                                <adf-create-process-attachment *ngIf="currentProcessInstanceId"
-                                                            [processInstanceId]="currentProcessInstanceId"
-                                                            (contentCreated)="onContentCreated()">
-                                </adf-create-process-attachment>
+                                <div class="action-header">
+                                    <button id="show_process_attach" class="mdl-button mdl-js-button" (click)="toggleCreateProcessAttach()">
+                                        Attach Document
+                                        <i class="material-icons">add</i>
+                                    </button>
+                                </div>
+                                <adf-process-attachment-list *ngIf="currentProcessInstanceId"
+                                                          [processInstanceId]="currentProcessInstanceId"
+                                                          (attachmentClick)="onAttachmentClick($event)">
+                                </adf-process-attachment-list>
+                                <div *ngIf="isCreateProcessAttachVisible()">
+                                    <adf-create-process-attachment *ngIf="currentProcessInstanceId"
+                                                                [processInstanceId]="currentProcessInstanceId"
+                                                                (contentCreated)="onContentCreated()">
+                                    </adf-create-process-attachment>
+                                </div>
                             </div>
                         </div>
                         <div class="mdl-cell mdl-cell--10-col task-column mdl-shadow--2dp" *ngIf="isStartProcessMode()">
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index d35b8a50dc..1cd6fd27f0 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -20,6 +20,7 @@ import {
     ActivitiApps,
     ActivitiFilters,
     ActivitiTaskList,
+    ActivitiTaskDetails,
     FilterRepresentationModel,
     TaskDetailsEvent,
     TaskAttachmentListComponent
@@ -74,6 +75,9 @@ export class ActivitiDemoComponent implements AfterViewInit {
     @ViewChild(ActivitiProcessInstanceDetails)
     activitiprocessdetails: ActivitiProcessInstanceDetails;
 
+    @ViewChild(ActivitiTaskDetails)
+    activitidetails: ActivitiTaskDetails;
+
     @ViewChild(ActivitiProcessAttachmentListComponent)
     processAttachList: ActivitiProcessAttachmentListComponent;
 
@@ -361,4 +365,8 @@ export class ActivitiDemoComponent implements AfterViewInit {
     isCreateProcessAttachVisible(): boolean {
         return this.createProcessAttach;
     }
+
+    isTaskCompleted(): boolean {
+        return this.activitidetails.isCompletedTask();
+    }
 }
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
index e1d9096c3b..4060d0ebce 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
@@ -296,4 +296,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
     toggleHeaderContent() {
         this.showHeaderContent = !this.showHeaderContent;
     }
+
+    isCompletedTask(): boolean {
+        return this.taskDetails && this.taskDetails.endDate ? true : undefined;
+    }
 }