diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
index cad5f42..b7ef742 100644
--- a/Bloxstrap/App.xaml.cs
+++ b/Bloxstrap/App.xaml.cs
@@ -317,7 +317,7 @@ namespace Bloxstrap
                 // this ordering is very important as all wpf windows are shown as modal dialogs, mess it up and you'll end up blocking input to one of them
                 dialog?.ShowBootstrapper();
 
-                if (Settings.Prop.EnableActivityTracking)
+                if (!IsNoLaunch && Settings.Prop.EnableActivityTracking)
                     NotifyIcon?.InitializeContextMenu();
 
                 bootstrapperTask.Wait();
diff --git a/Bloxstrap/UI/NotifyIconWrapper.cs b/Bloxstrap/UI/NotifyIconWrapper.cs
index 3e3c381..91d626c 100644
--- a/Bloxstrap/UI/NotifyIconWrapper.cs
+++ b/Bloxstrap/UI/NotifyIconWrapper.cs
@@ -134,7 +134,7 @@ namespace Bloxstrap.UI
             App.Logger.WriteLine($"[NotifyIconWrapper::Dispose] Disposing NotifyIcon");
 
             _menuContainer?.Dispatcher.Invoke(_menuContainer.Close);
-            _notifyIcon.Dispose();
+            _notifyIcon?.Dispose();
 
             _disposed = true;