1 files changed, 6 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
index 8d1355795..746edf9e7 100644
--- a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -41,7 +41,12 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             else if (_config.Configuration.IsStartupWizardCompleted)
             {
-                BrowserLauncher.OpenDashboardPage("index.html", _appHost);
+                var options = ((ApplicationHost)_appHost).StartupOptions;
+
+                if (!options.ContainsOption("-service") && !options.ContainsOption("-nobrowser"))
+                {
+                    BrowserLauncher.OpenDashboardPage("index.html", _appHost);
+                }
             }
         }