diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 67787ebfe..c75217db7 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -24,6 +24,8 @@ export class EventListPage implements OnInit {
   categories: string[];
   serialnumber:string;
 
+  skeletonLoader = true
+
 
   constructor(
     private processes:ProcessesService,
@@ -61,6 +63,8 @@ export class EventListPage implements OnInit {
 
   async LoadToApproveEvents(){
     this.showLoader = true;
+    this.skeletonLoader = true
+
     console.log(this.segment);
     if(this.segment == 'MDGPR'){
       let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
@@ -73,6 +77,7 @@ export class EventListPage implements OnInit {
       this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
     }
     this.showLoader = false;
+    this.skeletonLoader = false
   }
 
   async openApproveModal(eventSerialNumber, event){
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index e00e8cb95..1b109ee26 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -10,7 +10,9 @@
       </button>
     </div>
   </div>
-  <div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex"><h3 class="bottom-text">Presidente da República</h3></div>
+  <div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex">
+    <h3 class="bottom-text">Presidente da República</h3>
+  </div>
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
@@ -20,68 +22,70 @@
         refreshingSpinner="circles"
         refreshingText="A actualizar...">
       </ion-refresher-content>
-    </ion-refresher>
+  </ion-refresher>
   
-  <div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
-    <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
-    <ion-list>
-      <ion-item 
-          class="expediente ion-no-padding cursor-pointer"  
-          *ngFor = "let task of despachoList; let i = index"
-          (click)="goToDespacho(task.SerialNumber)"
-          >
-          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-            <div class="item width-100">
-              <div class="exp-top-detail">
-                <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                </div>
-                <div class="exp-remetente">
-                  <ion-label>{{task.Senders}}</ion-label>
-                </div>
-                <div class="exp-workflow">
-                  <span class="label">{{task.activityInstanceName}}</span>
-                </div>
-                <div class="exp-icon d-flex align-center">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <label>{{task.DocumentsQty}}</label>
-
-                  <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+  <div class="main-container height-100 overflow-y-auto d-flex flex-column ">
+    <div *ngIf="despachoList.length >= 1" class=" height-100">
+      <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+      <ion-list>
+        <ion-item 
+            class="expediente ion-no-padding cursor-pointer"  
+            *ngFor = "let task of despachoList; let i = index"
+            (click)="goToDespacho(task.SerialNumber)"
+            >
+            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+              <div class="item width-100">
+                <div class="exp-top-detail">
+                  <div class="exp-date">
+                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  </div>
+                  <div class="exp-remetente">
+                    <ion-label>{{task.Senders}}</ion-label>
+                  </div>
+                  <div class="exp-workflow">
+                    <span class="label">{{task.activityInstanceName}}</span>
+                  </div>
+                  <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  </ion-menu-button> -->
+                    <label>{{task.DocumentsQty}}</label>
+  
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> -->
+                  </div>
+                </div>
+                <div class="exp-bottom-detail">
+                  <ion-label>{{ task.Folio }}</ion-label>
                 </div>
               </div>
-              <div class="exp-bottom-detail">
-                <ion-label>{{ task.Folio }}</ion-label>
-              </div>
-            </div>
-          </ion-item>
-    </ion-list>
-  </div>
-  <div *ngIf="skeletonLoader && despachoList.length == 0" class="overflow-y-auto height-100">
-  
-    <ion-list>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-    </ion-list>
+            </ion-item>
+      </ion-list>
+    </div>
+    <div *ngIf="skeletonLoader && despachoList.length == 0">
+    
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
   </div>
 </ion-content>
 
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index f0f73fce5..77e05e7dc 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -19,7 +19,7 @@
   </ion-toolbar>
 </ion-header>
 <ion-content>
-  <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
+  <div *ngIf="diplomasList.length >= 1" class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
     
     <div *ngIf="diplomasList">