diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 20181704c..a1f53fca9 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -389,6 +389,7 @@
         (openAttendeesComponent)="openAttendeesComponent($event)"
         (openAddEvent)="openAddEvent()"
         (GoBackEditOrAdd)="GoBackEditOrAdd()"
+        (setContact)="setContact($event)"
       >
       </app-attendee-modal>
 
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index ab46f0367..fafddf780 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -958,7 +958,7 @@ export class AgendaPage implements OnInit {
 
 
     if(Array.isArray(data)){
-      if(data.length != 0){
+      if(data.length >= 1){
        
         console.log('save!!!',data.length);
         console.log(data);
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index b99bd5059..b26568c75 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -21,6 +21,7 @@ export class AttendeeModalPage implements OnInit {
 
   @Output() openAttendeesComponent = new EventEmitter<any>();
   @Output() GoBackEditOrAdd = new EventEmitter<any>();
+  @Output() setContact = new EventEmitter<any>();
   
   ngOnInit() {
     this.fetchContacts("");
@@ -30,14 +31,15 @@ export class AttendeeModalPage implements OnInit {
   save(){
 
     // set data to agenda component
-    this.openAttendeesComponent.emit(this.selectedContact);
+    this.setContact.emit(this.selectedContact);
     // got back
     this.GoBackEditOrAdd.emit();
   }
 
   close(){
     // this.modalCtrl.dismiss(null);
-    this.openAttendeesComponent.emit(false);
+    this.selectedContact = [];
+    this.GoBackEditOrAdd.emit();
   }
 
   onChange(evt: any) {