diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index b0a017e59..d743f4c9f 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -392,10 +392,10 @@ export class NewEventPage implements OnInit {
 
   selectedCalendarId () {
 
-    if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial']) {
+    if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') {
       return this.eventService.calendarNamesType[this.CalendarName]['OficialId']
 
-    } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) {
+    } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') {
 
       return this.eventService.calendarNamesType[this.CalendarName]['PessoalId']
 
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index db03f7f29..c631837b4 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -334,10 +334,10 @@ export class BookMeetingModalPage implements OnInit {
 
   selectedCalendarId () {
 
-    if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial']) {
+    if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
       return this.calendarService.calendarNamesType[this.CalendarOwnerName]['OficialId']
 
-    } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal']) {
+    } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
 
       return this.calendarService.calendarNamesType[this.CalendarOwnerName]['PessoalId']
 
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index b9819c308..5fb8e816b 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -565,10 +565,10 @@ export class NewEventPage implements OnInit {
 
   selectedCalendarId () {
 
-    if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial']) {
+    if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') {
       return this.eventService.calendarNamesType[this.CalendarName]['OficialId']
 
-    } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) {
+    } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') {
 
       return this.eventService.calendarNamesType[this.CalendarName]['PessoalId']