diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index e0b7fa13d..873093ac6 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -82,27 +82,27 @@ export class HomePage implements OnInit {
 
   async count() {
 
-    let date = new Date();
-    date.setMonth(date.getMonth() + 1);
-    let start = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-    let end = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " 23:59:59";
+    // let date = new Date();
+    // date.setMonth(date.getMonth() + 1);
+    // let start = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+    // let end = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " 23:59:59";
 
-    this.profile = "mdgpr";
-    if (this.profile == "mdgpr") {
+    // this.profile = "mdgpr";
+    // if (this.profile == "mdgpr") {
 
-      let mdOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise();
-      let mdPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
-      this.eventsList = mdOficialEvents.concat(mdPessoalEvents)
-      this.totalEvent = this.eventsList.length;
+    //   let mdOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise();
+    //   let mdPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
+    //   this.eventsList = mdOficialEvents.concat(mdPessoalEvents)
+    //   this.totalEvent = this.eventsList.length;
 
-    }
-    else {
-      let prOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise();
-      let prPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
-      this.eventsList = prOficialEvents.concat(prPessoalEvents)
-      this.totalEvent = this.eventsList.length;
+    // }
+    // else {
+    //   let prOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise();
+    //   let prPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
+    //   this.eventsList = prOficialEvents.concat(prPessoalEvents)
+    //   this.totalEvent = this.eventsList.length;
 
-    }
+    // }
 
   }
 
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 8fad14001..60d5a3004 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -190,14 +190,17 @@ export class AgendaPage implements OnInit {
 
     const pathname = window.location.pathname
 
+    let rrealoadCounter = 0
+
     this.router.events.forEach((event) => {
 
-      if(event instanceof NavigationEnd && event.url == "/home/agenda") {
+      if(event instanceof NavigationEnd && event.url == pathname ) {
         if (this.segment == null){
           this.segment = "Combinado";
         }
-        else{
+        else if ( rrealoadCounter != 0) {
           this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+          rrealoadCounter++;
         }
       }
     });
@@ -336,7 +339,6 @@ export class AgendaPage implements OnInit {
 
   // for timeline
 
-
   get CalendarCurrentDay ():any {
 
     /* console.log(this.viewDate.getDate(), '0_0') */
@@ -460,6 +462,8 @@ export class AgendaPage implements OnInit {
   }
 
   loadRangeEvents(startTime: Date, endTime: Date){
+          
+    console.log('==========================================================')
 
     this.eventSelectedDate = new Date(startTime);
 
@@ -774,9 +778,6 @@ export class AgendaPage implements OnInit {
   
       } 
     } else {
-      
-      //this.showTimelinePR = false;
-      //this.showTimelineMD = false;
 
       // calendar
       let counter = 0;
@@ -834,12 +835,6 @@ 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) => {
@@ -887,12 +882,6 @@ export class AgendaPage implements OnInit {
           this.showLoader = false;
         }
 
-        }).finally(() =>{
-            
-          counter++;
-          if(counter==2) {
-            this.showLoader = false;
-          }
         })
 
 
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 53fa0cfb8..cd9803bcb 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -178,6 +178,7 @@ export class EventsService {
   }
 
   async getAllMdEvents(startdate:string, enddate:string){
+    console.log('md once')
     let prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise();
     let prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise();
     const resFinal = prO.concat(prP);
@@ -187,6 +188,18 @@ export class EventsService {
     });
   }
 
+  async getAllSharedEvents(startdate:string, enddate:string) {
+    console.log('pr once')
+    let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
+    let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
+    const resFinal = prO.concat(prP);
+    console.log(resFinal);
+    
+    return new Promise(resolve =>{
+      return resolve(resFinal)
+    });
+  }
+
 
 
   getAllSharedOficialEvents(startdate:string, enddate:string): Observable<Event[]>{
@@ -219,16 +232,7 @@ export class EventsService {
     return this.http.get<Event[]>(`${geturl}`, options);
   }
 
-  async getAllSharedEvents(startdate:string, enddate:string){
-    let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
-    let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
-    const resFinal = prO.concat(prP);
-    console.log(resFinal);
-    
-    return new Promise(resolve =>{
-      return resolve(resFinal)
-    });
-  }
+
 
   getRecurrenceTypes(): any{
     const geturl = environment.apiURL + 'Calendar/RecurrenceTypes';