diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 6df2daf..f565e62 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -374,8 +374,16 @@ namespace BreCalClient
             Shipcall shipcall = scm.Shipcall;
             if (BreCalLists.ShipLookupDict.ContainsKey(shipcall.ShipId))
                 scm.Ship = BreCalLists.ShipLookupDict[shipcall.ShipId];
-            if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
-                scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
+            if (shipcall.Type == 1)
+            {
+                if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
+                    scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
+            }
+            else
+            {
+                if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.DepartureBerthId ?? 0))
+                    scm.Berth = BreCalLists.BerthLookupDict[shipcall.DepartureBerthId ?? 0].Name;
+            }
             scm.AssignParticipants();
 
             this.Dispatcher.Invoke(() =>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index a087172..06ba11f 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -191,11 +191,11 @@ namespace BreCalClient
 
                     this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
                     this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
-                    if ((this.ShipcallControlModel?.Shipcall?.Type == 1) || (this.ShipcallControlModel?.Shipcall?.Type == 3))
+                    if (this.ShipcallControlModel?.Shipcall?.Type == 1) 
                     {
                         this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta?.ToString("dd.MM. HH:mm");
                     }
-                    if (this.ShipcallControlModel?.Shipcall?.Type == 2)
+                    if ((this.ShipcallControlModel?.Shipcall?.Type == 2) || (this.ShipcallControlModel?.Shipcall?.Type == 3))
                     {
                         this.labelETA.Text = "ETD";
                         this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd?.ToString("dd.MM. HH:mm");