diff --git a/lib/process-services/process-list/components/process-instance-details.component.html b/lib/process-services/process-list/components/process-instance-details.component.html
index c8fa24372d..900fed27f9 100644
--- a/lib/process-services/process-list/components/process-instance-details.component.html
+++ b/lib/process-services/process-list/components/process-instance-details.component.html
@@ -9,7 +9,7 @@
             (showProcessDiagram)="onShowProcessDiagram($event)">
         </adf-process-instance-header>
 
-        <button class="adf-in-medias-res-button" mat-button id="show-diagram-button" type="button" mat-button mat-raised-button [disabled]="isDiagramDisabled()" (click)="onShowProcessDiagram(processInstanceId)">{{ 'ADF_PROCESS_LIST.DETAILS.BUTTON.SHOW_DIAGRAM' | translate }}</button>
+        <button class="adf-in-medias-res-button" mat-button id="show-diagram-button" type="button" mat-button mat-raised-button [disabled]="!isRunning()" (click)="onShowProcessDiagram(processInstanceId)">{{ 'ADF_PROCESS_LIST.DETAILS.BUTTON.SHOW_DIAGRAM' | translate }}</button>
 
         <mat-card>
             <mat-card-content>
diff --git a/lib/process-services/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/process-list/components/process-instance-details.component.spec.ts
index 5ce0fb6f65..bbdd22e81e 100644
--- a/lib/process-services/process-list/components/process-instance-details.component.spec.ts
+++ b/lib/process-services/process-list/components/process-instance-details.component.spec.ts
@@ -49,7 +49,7 @@ describe('ProcessInstanceDetailsComponent', () => {
             providers: [
                 ProcessService
             ],
-            schemas: [ NO_ERRORS_SCHEMA ]
+            schemas: [NO_ERRORS_SCHEMA]
         }).compileComponents();
     }));
 
@@ -132,12 +132,41 @@ describe('ProcessInstanceDetailsComponent', () => {
 
         it('should display cancel button if process is running', () => {
             component.processInstanceDetails = new ProcessInstance({
-                ended : null
+                ended: null
             });
             fixture.detectChanges();
             let buttonEl = fixture.debugElement.query(By.css('[data-automation-id="header-status"] button'));
             expect(buttonEl).not.toBeNull();
         });
-    });
 
+        describe('Diagram', () => {
+
+            it('should diagram button be enabled if the process is running', () => {
+                component.processInstanceDetails = new ProcessInstance({
+                    ended: null
+                });
+                fixture.detectChanges();
+
+                fixture.whenStable().then(() => {
+                    let diagramButton = fixture.debugElement.query(By.css('#show-diagram-button'));
+                    expect(diagramButton).not.toBeNull();
+                    expect(diagramButton.nativeElement.disabled).toBe(false);
+                });
+            });
+
+            it('should diagram button be enabled if the process is running', () => {
+                component.processInstanceDetails = new ProcessInstance({
+                    ended: new Date()
+                });
+
+                fixture.detectChanges();
+
+                fixture.whenStable().then(() => {
+                    let diagramButton = fixture.debugElement.query(By.css('#show-diagram-button'));
+                    expect(diagramButton).not.toBeNull();
+                    expect(diagramButton.nativeElement.disabled).toBe(true);
+                });
+            });
+        });
+    });
 });
diff --git a/lib/process-services/process-list/components/process-instance-details.component.ts b/lib/process-services/process-list/components/process-instance-details.component.ts
index 1b282db975..07ecc1bb2d 100644
--- a/lib/process-services/process-list/components/process-instance-details.component.ts
+++ b/lib/process-services/process-list/components/process-instance-details.component.ts
@@ -103,10 +103,6 @@ export class ProcessInstanceDetailsComponent implements OnChanges {
         return this.processInstanceDetails && !this.processInstanceDetails.ended;
     }
 
-    isDiagramDisabled(): boolean {
-        return !this.isRunning() ? true : undefined;
-    }
-
     cancelProcess() {
         this.activitiProcess.cancelProcess(this.processInstanceId).subscribe(
             (data) => {