diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index cb7b9226f..883574522 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -56,7 +56,7 @@
 
 
                   <!-- Debug line to print data -->
-                    <mat-form-field class="select-calendar" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda" *ngIf="calendarData?.length && showCalendarField" (click)="hasChangeCalendar=true">
+                    <mat-form-field class="select-calendar" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda" *ngIf="calendarData?.length && showCalendarField">
                       <div *ngIf="selectedUserCalendar != SessionStore.user.UserId && !hasChangeCalendar  " style="margin-bottom: -20px;">PR </div>
                       <div *ngIf="selectedUserCalendar == SessionStore.user.UserId && !hasChangeCalendar  " style="margin-bottom: -20px;">
                         Minha agenda
@@ -69,7 +69,7 @@
 
                           <div *ngIf="calendars.roleId == RoleIdService.PRES">PR </div>
                           <div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGENDA DO MDGPR</div>
-                          <div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName"> Agenda do {{calendars.wxFullName}} </div>
+                          <div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId "> Agenda do {{calendars.wxFullName}} </div>
                           <div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
                             Minha agenda
                           </div>
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index bb341577e..90efc91fa 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -152,6 +152,7 @@ export class LoginPage implements OnInit {
             if (attempt.ChatData) {
 
               try {
+
                 await this.AgendaDataRepositoryService.getSharedCalendar()
                 await MessageModel.deleteAll();
                 await DeleteMessageModel.deleteAll();
@@ -177,6 +178,8 @@ export class LoginPage implements OnInit {
           } else {
 
 
+            await this.AgendaDataRepositoryService.clearSharedCalendar()
+            await this.AgendaDataRepositoryService.createOwnCalendar()
             this.RochetChatConnectorService.logout();
             this.clearStoreService.clear();
             this.ChatSystemService.clearChat();
diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
index 1a4078af3..2b80f1c8b 100644
--- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
+++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
@@ -21,7 +21,21 @@ export class AgendaDataRepositoryService {
     private agendaDataService: AgendaDataService,
     private utils: Utils,
     private agendaLocalDataSourceService: AgendaLocalDataSourceService
-  ) { }
+  ) {}
+
+  createOwnCalendar() {
+    const currentUserCalendar = {
+      wxUserId: SessionStore.user.UserId,
+      wxFullName: SessionStore.user.FullName,
+      wxeMail: SessionStore.user.Email,
+      role: SessionStore.user.RoleDescription,
+      roleId: SessionStore.user.RoleID,
+      shareType: 0,
+      date: '',
+    }
+
+    return this.agendaLocalDataSourceService.createCalendar(currentUserCalendar)
+  }
 
   async getEventById(id: string) {
     try {
@@ -176,21 +190,11 @@ export class AgendaDataRepositoryService {
     const result = await this.agendaDataService.getSharedCalendar()
 
     if(result.isOk()) {
-      await this.agendaLocalDataSourceService.clearSharedCalendar()
+
       if(result.value?.data) {
 
-        const currentUserCalendar = {
-          wxUserId: SessionStore.user.UserId,
-          wxFullName: SessionStore.user.FullName,
-          wxeMail: SessionStore.user.Email,
-          role: SessionStore.user.RoleDescription,
-          roleId: SessionStore.user.RoleID,
-          shareType: 0,
-          date: '',
-        }
-
-        result.value.data.push(currentUserCalendar)
-
+        await this.agendaLocalDataSourceService.clearSharedCalendar()
+        await this.createOwnCalendar()
         return await this.agendaLocalDataSourceService.bulkCreate(result.value.data)
       } else {
         return result
@@ -201,6 +205,10 @@ export class AgendaDataRepositoryService {
 
   }
 
+  async clearSharedCalendar() {
+    return  await this.agendaLocalDataSourceService.clearSharedCalendar()
+  }
+
   getShareCalendarItemsLive() {
     return this.agendaLocalDataSourceService.getShareCalendarItemsLive()
   }
diff --git a/src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts b/src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts
index 6c8273eb9..fd594f1da 100644
--- a/src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts
+++ b/src/app/services/Repositorys/Agenda/agenda-local-data-source.service.ts
@@ -45,6 +45,16 @@ export class AgendaLocalDataSourceService {
     }
   }
 
+  async createCalendar(data: SharedCalendarListItemOutputDTO) {
+    // db.eve
+    try {
+      const result = await AgendaDataSource.shareCalendar.add(data)
+      return ok(result)
+    } catch (e) {
+      return err(false)
+    }
+  }
+
   clearSharedCalendar() {
     // db.eve
     try {
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 4a350c6f9..844532a14 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -71,9 +71,7 @@ export class EventListPage implements OnInit {
         }))
       )
 
-      this.eventService.onCalendarFinishLoad.subscribe(async() => {
-        this.setCalendarByDefault()
-      })
+      this.setCalendarByDefault()
 
   }