diff --git a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
index fd9ce3a36..00cfa0c9a 100644
--- a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
+++ b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
@@ -36,9 +36,9 @@ namespace Emby.Server.Implementations.AppBase
         public string ProgramDataPath { get; private set; }
 
         /// <summary>
-        /// Gets the path to the web resources folder
+        /// Gets the path to the web UI resources folder
         /// </summary>
-        /// <value>The web resources path.</value>
+        /// <value>The web UI resources path.</value>
         public string WebPath { get; set; }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index f240ef871..14c700cc5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -621,7 +621,7 @@ namespace Emby.Server.Implementations
             string contentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath;
             if (string.IsNullOrEmpty(contentRoot))
             {
-                contentRoot = Path.Combine(ServerConfigurationManager.ApplicationPaths.WebPath, "src");
+                contentRoot = ServerConfigurationManager.ApplicationPaths.WebPath;
             }
 
             var host = new WebHostBuilder()
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 8f1498b13..7534a6398 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -277,7 +277,7 @@ namespace Jellyfin.Server
                 if (string.IsNullOrEmpty(webDir))
                 {
                     // Use default location under ResourcesPath
-                    webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web");
+                    webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web", "src");
                 }
             }
 
diff --git a/Jellyfin.Server/StartupOptions.cs b/Jellyfin.Server/StartupOptions.cs
index 2b01c7bbd..345a8a731 100644
--- a/Jellyfin.Server/StartupOptions.cs
+++ b/Jellyfin.Server/StartupOptions.cs
@@ -11,7 +11,7 @@ namespace Jellyfin.Server
         [Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")]
         public string DataDir { get; set; }
 
-        [Option('w', "webdir", Required = false, HelpText = "Path to the Jellyfin web resources.")]
+        [Option('w', "webdir", Required = false, HelpText = "Path to the Jellyfin web UI resources.")]
         public string WebDir { get; set; }
 
         [Option('C', "cachedir", Required = false, HelpText = "Path to use for caching.")]
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index 1f56c98fd..fd11bf904 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -12,9 +12,9 @@ namespace MediaBrowser.Common.Configuration
         string ProgramDataPath { get; }
 
         /// <summary>
-        /// Gets the path to the web resources folder
+        /// Gets the path to the web UI resources folder
         /// </summary>
-        /// <value>The web resources path.</value>
+        /// <value>The web UI resources path.</value>
         string WebPath { get; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index fa7262481..222c10798 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -84,9 +84,9 @@ namespace MediaBrowser.Model.System
         public string ProgramDataPath { get; set; }
 
         /// <summary>
-        /// Gets or sets the web resources path.
+        /// Gets or sets the web UI resources path.
         /// </summary>
-        /// <value>The web resources path.</value>
+        /// <value>The web UI resources path.</value>
         public string WebPath { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 05df54b11..01cbe2c31 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -149,7 +149,7 @@ namespace MediaBrowser.WebDashboard.Api
                     return _serverConfigurationManager.Configuration.DashboardSourcePath;
                 }
 
-                return Path.Combine(_serverConfigurationManager.ApplicationPaths.WebPath, "src");
+                return _serverConfigurationManager.ApplicationPaths.WebPath;
             }
         }