diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html
index c79fe3a458..c5a6e653f3 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.html
@@ -1,7 +1,9 @@
 <h2>Process Heat map</h2>
-<form [formGroup]="metricForm" novalidate>
-    <dropdown-widget [field]="field" [group]="metricForm.controls.metricGroup" [controllerName]="'metric'"
-                     (fieldChanged)="onMetricChanges(field)"></dropdown-widget>
-</form>
-
-<diagram *ngIf="currentMetric" [processDefinitionId]="report.processDefinitionId" [metricPercentages]="currentMetric"></diagram>
\ No newline at end of file
+<div *ngIf="hasMetric()">
+    <form [formGroup]="metricForm" novalidate>
+        <dropdown-widget [field]="field" [group]="metricForm.controls.metricGroup" [controllerName]="'metric'"
+                         (fieldChanged)="onMetricChanges(field)" [showDefaultOption]="false"></dropdown-widget>
+    </form>
+    <diagram *ngIf="currentMetric" [processDefinitionId]="report.processDefinitionId" [metricPercentages]="currentMetric"></diagram>
+</div>
+<div *ngIf="!hasMetric()">No metric found</div>
\ No newline at end of file