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 237473091..008df2e4e 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -109,16 +109,17 @@ export class EditEventPage implements OnInit {
         }
       }
 
-      const result = this.participantsPipe.transform(this.postEvent.Attendees)
-      this.taskParticipants = result.taskParticipants
-      this.taskParticipantsCc = result.taskParticipantsCc
+      if (this.postEvent.Attendees != null) {
+        const result = this.participantsPipe.transform(this.postEvent.Attendees)
+        this.taskParticipants = result.taskParticipants
+        this.taskParticipantsCc = result.taskParticipantsCc
 
-      this.taskParticipants = removeDuplicate(this.taskParticipants);
-      this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
-
-      this.setIntervenient.emit(this.taskParticipants);
-      this.setIntervenientCC.emit(this.taskParticipantsCc);
+        this.taskParticipants = removeDuplicate(this.taskParticipants);
+        this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
 
+        this.setIntervenient.emit(this.taskParticipants);
+        this.setIntervenientCC.emit(this.taskParticipantsCc);
+      }
     }
 
     this.initCalendarName = this.postEvent.CalendarName;
@@ -127,14 +128,10 @@ export class EditEventPage implements OnInit {
 
     this.getRecurrenceTypes();
 
-    this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
-
-    // this.postEvent.EventRecurrence.LastOccurrence = this.currentDate;
-
     setTimeout(() => {
       this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
       
-    }, 1000);
+    }, 500);
 
 
   }