diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index a355a9a67..ee4b48c52 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -184,7 +184,7 @@ export class AgendaPage implements OnInit {
     this.profile = "mdgpr";
 
     const pathname = window.location.pathname
-    
+
     this.router.events.forEach((event) => {
 
       if(event instanceof NavigationEnd && event.url == "/home/agenda") {
@@ -511,7 +511,9 @@ export class AgendaPage implements OnInit {
                 this.showTimeline = true;
                 
   
-            });
+            }).finally(()=>{
+              this.showLoader = false;
+            })
       
           }
           else if(this.profile == "pr" && this.loggeduser.Profile == 'MDGPR'){
@@ -555,7 +557,9 @@ export class AgendaPage implements OnInit {
   
                
   
-              });
+              }).finally(()=>{
+                this.showLoader = false;
+              })
             
 
           }
@@ -599,7 +603,9 @@ export class AgendaPage implements OnInit {
   
                
   
-              });
+              }).finally(()=>{
+                this.showLoader = false;
+              })
           }
         break;
   
@@ -642,7 +648,9 @@ export class AgendaPage implements OnInit {
 
               this.showLoader = false;
               this.showTimeline = true;
-            });
+            }).finally(()=>{
+              this.showLoader = false;
+            })
   
           }
           else{
@@ -677,7 +685,9 @@ export class AgendaPage implements OnInit {
               this.showLoader = false;
               this.showTimeline = true;
 
-            });
+            }).finally(()=>{
+              this.showLoader = false;
+            })
           }
           break;
   
@@ -717,7 +727,9 @@ export class AgendaPage implements OnInit {
                 this.showLoader = false;
                 this.showTimeline = true;
   
-              });
+              }).finally(()=>{
+                this.showLoader = false;
+              })
           } else {
             this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((res:any) => {
               this.eventSource=[];  
@@ -749,7 +761,9 @@ export class AgendaPage implements OnInit {
               this.showLoader = false;
               this.showTimeline = true;
 
-            });
+            }).finally(()=>{
+              this.showLoader = false;
+            })
           }
           break;
   
@@ -815,7 +829,13 @@ export class AgendaPage implements OnInit {
               this.showLoader = false;
             }
            
-        });
+        }).finally(() =>{
+            
+          counter++;
+          if(counter==2) {
+            this.showLoader = false;
+          }
+        })
 
         this.eventService.getAllSharedEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
     
@@ -862,7 +882,13 @@ export class AgendaPage implements OnInit {
           this.showLoader = false;
         }
 
-        });
+        }).finally(() =>{
+            
+          counter++;
+          if(counter==2) {
+            this.showLoader = false;
+          }
+        })
 
 
       } else {
@@ -909,11 +935,15 @@ export class AgendaPage implements OnInit {
         
         counter++;
 
-        if(counter==2 || this.loggeduser.Profile == 'PR') {
+        if(counter==1 || this.loggeduser.Profile == 'PR') {
           this.showLoader = false;
         }
 
-      });
+      }).finally(()=>{
+        if(counter==1 || this.loggeduser.Profile == 'PR') {
+          this.showLoader = false;
+        }
+      })
 
     }