diff --git a/src/Artemis.UI/Screens/TrayViewModel.cs b/src/Artemis.UI/Screens/TrayViewModel.cs
index c17ab70ae..112c163b3 100644
--- a/src/Artemis.UI/Screens/TrayViewModel.cs
+++ b/src/Artemis.UI/Screens/TrayViewModel.cs
@@ -50,15 +50,14 @@ namespace Artemis.UI.Screens
             messageService.ConfigureNotificationProvider(this);
             bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun");
             bool showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value;
-            if (!autoRunning || showOnAutoRun)
+
+            if (autoRunning && !showOnAutoRun)
+                coreService.Initialized += (_, _) => updateService.AutoUpdate();
+            else
             {
                 ShowSplashScreen();
                 coreService.Initialized += (_, _) => TrayBringToForeground();
             }
-            else
-            {
-                coreService.Initialized += (_, _) => updateService.AutoUpdate();
-            }
         }
 
         public void TrayBringToForeground()