diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 0da3882..85d00a2 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -35,7 +35,7 @@
     <div *ngIf="activeSubCategory"
          class="uk-width-expand uk-background-muted uk-padding uk-text-center@s uk-text-left@m">
       <h5 class="uk-margin-bottom uk-text-bold">Indicators</h5>
-      <div class="uk-grid-medium uk-margin-bottom" uk-grid>
+      <div class="uk-grid-medium uk-margin-bottom" uk-grid uk-height-match="target: div > h6">
         <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
           <div *ngIf="number.isActive && number.isPublic"
                [class.uk-width-1-3@m]="number.width === 'small'"
@@ -43,9 +43,12 @@
                [class.uk-width-1-1@m]="number.width === 'large'">
             <div class="uk-card uk-card-default uk-box-shadow-large uk-padding-small" [attr.uk-tooltip]="number.description">
               <h6>{{number.name}}</h6>
-              <div class="uk-h2">
+              <div class="uk-h2" *ngIf="numberResults.get(i)">
                 {{numberResults.get(i)|number}}
               </div>
+              <div *ngIf="!numberResults.get(i)" class="uk-animation-fade uk-width-1-1" role="alert">
+                <span class="loading-gif uk-align-center"></span>
+              </div>
             </div>
           </div>
         </ng-template>
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index d7a5d87..8eb0f8d 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -60,6 +60,8 @@ export class MonitorComponent {
           var url = data.envSpecific.baseLink + this._router.url;
           if (!this.stakeholder || this.stakeholder.index_id !== params['stakeholder']) {
             this.status = this.errorCodes.LOADING;
+            this.numberResults= new Map<number, number>();
+            this.chartsActiveType = new Map<number, IndicatorPath>();
             this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => {
               this.stakeholder = stakeholder;
               this.seoService.createLinkForCanonicalURL(url, false);