diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index e9a7d59857..673c6cdddf 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -133,9 +133,22 @@ namespace MediaBrowser.ServerApplication
             LocalizeText();
 
             notifyIcon1.DoubleClick += notifyIcon1_DoubleClick;
+            Application.ThreadExit += Application_ThreadExit;
             Application.ApplicationExit += Application_ApplicationExit;
         }
 
+        void Application_ThreadExit(object sender, EventArgs e)
+        {
+            try
+            {
+                notifyIcon1.Visible = false;
+            }
+            catch
+            {
+
+            }
+        }
+
         void Application_ApplicationExit(object sender, EventArgs e)
         {
             try