diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 1e4a6d5..041d16a 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -160,12 +160,7 @@ namespace BreCalClient
                 this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
                 this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
                 this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
-
-
-
-                // remove all and add selected participants
-                this.ShipcallModel.Shipcall.Participants.Clear();
-                this.ShipcallModel.AssignedParticipants.Clear();
+                
 
                 Participant? participant;
                 participant = (Participant?)this.comboBoxAgency.SelectedItem;
@@ -177,6 +172,12 @@ namespace BreCalClient
                         Type = (int)Extensions.ParticipantType.AGENCY
                     };
                     this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.AGENCY] = pa;
+                } 
+                else
+                {
+                    // AGENCY was set before and now is set to nothing
+                    if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
+                        this.ShipcallModel.AssignedParticipants.Remove(ParticipantType.AGENCY);
                 }
 
                 // BSMD and port authority are always added