diff --git a/Interpreter.Gui/MainWindow.xaml.cs b/Interpreter.Gui/MainWindow.xaml.cs
index 8e03a2e..d5926a3 100644
--- a/Interpreter.Gui/MainWindow.xaml.cs
+++ b/Interpreter.Gui/MainWindow.xaml.cs
@@ -166,6 +166,7 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         private void MainWindow_Unloaded(object sender, RoutedEventArgs e)
         {
             _timer.Stop();
+            CurrentLatency.Unpublish();
         }
 
         private void Reset()
@@ -174,6 +175,7 @@ private void Reset()
             MessageArea.Text = "";
             LatencyLabel.Text = "";
             _latencyMeasurements.Clear();
+            CurrentLatency.Unpublish();
 
             TrueTime.TimeserverUrl = null;