diff --git a/src/SampleApp.WinDesktop/MainWindow.xaml.cs b/src/SampleApp.WinDesktop/MainWindow.xaml.cs
index ace07bb..e4be47e 100644
--- a/src/SampleApp.WinDesktop/MainWindow.xaml.cs
+++ b/src/SampleApp.WinDesktop/MainWindow.xaml.cs
@@ -68,6 +68,10 @@ namespace SampleApp.WinDesktop
             satSnr.ClearGsv();
             //Start new device
             currentDevice = device;
+            foreach(var child in MessagePanel.Children.OfType<UnknownMessageControl>().ToArray())
+            {
+                MessagePanel.Children.Remove(child);
+            }
             currentDevice.MessageReceived += device_MessageReceived;
             view2d.NmeaDevice = device;
             view3d.NmeaDevice = device;