diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 14f44d5e9..05dee1b4e 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -77,7 +77,7 @@
 
                 <mat-form-field appearance="none" floatLabel="never" class="width-100 " >
 
-                  <mat-select [(value)]="postEvent.CalendarName" class="width-100" [disabled]=true>
+                  <mat-select [(value)]="postEvent.CalendarName" class="width-100" [disabled]=false>
                     <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
                       Agenda {{ calendars }}
                     </mat-option>
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index c05af6d5e..ec53d00a6 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -170,7 +170,12 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnInit() {
-    this.postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency)
+    if(!this.postEvent.IsRecurring) {
+      this.postEvent.EventRecurrence.frequency = 'never'
+    } else {
+      this.postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency)
+    }
+    
     console.log(this.postEvent?.Attachments)
     console.log(this.loadedEventAttachments)
     window.onresize = (event) => {
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 5fec344da..f858150cc 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -82,7 +82,7 @@
         <div class="ion-input-class flex-grow-1">
 
           <mat-form-field appearance="none" floatLabel="never" class="width-100 ">
-            <mat-select placeholder="Selecione agenda*" [(ngModel)]="_postEvent.CalendarName" [disabled]=true>
+            <mat-select placeholder="Selecione agenda*" [(ngModel)]="_postEvent.CalendarName" [disabled]=false>
               <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
                 Agenda {{ calendars }}
               </mat-option>
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 5ad0b0b6f..3ed1c662e 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -118,7 +118,12 @@ export class EditEventPage implements OnInit {
     this.loadedEventAttachments = this.postEvent.Attachments
     console.log(this.postEvent)
     this._postEvent = this.postEvent
-    this._postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency)
+    if(!this._postEvent.IsRecurring) {
+      this._postEvent.EventRecurrence.frequency = 'never';
+    } else {
+      this._postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency)
+    }
+    
     this.allDayCheck = this.postEvent.IsAllDayEvent;
     if (!this.restoreTemporaryData()) {
       // clear