diff --git a/src/apps/Elsa.ServerAndStudio.Web/Pages/_Host.cshtml b/src/apps/Elsa.ServerAndStudio.Web/Pages/_Host.cshtml
index c2217d30d..a335e4c85 100644
--- a/src/apps/Elsa.ServerAndStudio.Web/Pages/_Host.cshtml
+++ b/src/apps/Elsa.ServerAndStudio.Web/Pages/_Host.cshtml
@@ -3,8 +3,7 @@
 @inject IConfiguration Configuration;
 @{
     var baseUrl = Configuration["Hosting:BaseUrl"]!;
-    var apiUrl = baseUrl + Url.Content("~/elsa/api");
-    var basePath = Configuration["Hosting:BasePath"]!;
+    var apiUrl = Configuration["Hosting:ApiUrl"]!;
 }
 
 <!DOCTYPE html>
@@ -15,20 +14,20 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
     <title>Elsa Studio 3.0</title>
     <base href="/"/>
-    <link rel="apple-touch-icon" sizes="180x180" href="@basePath/_content/Elsa.Studio.Shell/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="@basePath/_content/Elsa.Studio.Shell/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="@basePath/_content/Elsa.Studio.Shell/favicon-16x16.png">
-    <link rel="manifest" href="@basePath/_content/Elsa.Studio.Shell/site.webmanifest">
+    <link rel="apple-touch-icon" sizes="180x180" href="@baseUrl/_content/Elsa.Studio.Shell/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="@baseUrl/_content/Elsa.Studio.Shell/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="@baseUrl/_content/Elsa.Studio.Shell/favicon-16x16.png">
+    <link rel="manifest" href="@baseUrl/_content/Elsa.Studio.Shell/site.webmanifest">
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet"/>
     <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@300;400;500;700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css2?family=Grandstander:wght@100&display=swap" rel="stylesheet">
-    <link href="@basePath/_content/MudBlazor/MudBlazor.min.css" rel="stylesheet"/>
-    <link href="@basePath/_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet"/>
-    <link href="@basePath/_content/Radzen.Blazor/css/material-base.css" rel="stylesheet">
-    <link href="@basePath/_content/Elsa.Studio.Shell/css/shell.css" rel="stylesheet">
+    <link href="@baseUrl/_content/MudBlazor/MudBlazor.min.css" rel="stylesheet"/>
+    <link href="@baseUrl/_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet"/>
+    <link href="@baseUrl/_content/Radzen.Blazor/css/material-base.css" rel="stylesheet">
+    <link href="@baseUrl/_content/Elsa.Studio.Shell/css/shell.css" rel="stylesheet">
     <link href="ElsaStudioWebAssembly.styles.css" rel="stylesheet">
 </head>
 
@@ -44,19 +43,19 @@
     <a href="" class="reload">Reload</a>
     <a class="dismiss">🗙</a>
 </div>
-<script src="@basePath/_content/BlazorMonaco/jsInterop.js"></script>
-<script src="@basePath/_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js"></script>
-<script src="@basePath/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
-<script src="@basePath/_content/MudBlazor/MudBlazor.min.js"></script>
-<script src="@basePath/_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
-<script src="@basePath/_content/Radzen.Blazor/Radzen.Blazor.js"></script>
+<script src="@baseUrl/_content/BlazorMonaco/jsInterop.js"></script>
+<script src="@baseUrl/_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js"></script>
+<script src="@baseUrl/_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
+<script src="@baseUrl/_content/MudBlazor/MudBlazor.min.js"></script>
+<script src="@baseUrl/_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
+<script src="@baseUrl/_content/Radzen.Blazor/Radzen.Blazor.js"></script>
 <script>
     window.getClientConfig = function() { return {
         "apiUrl": "@apiUrl",
-        "basePath": "@basePath"
+        "baseUrl": "@baseUrl"
      } };
 </script>
-<script src="@basePath/_framework/blazor.webassembly.js"></script>
+<script src="@baseUrl/_framework/blazor.webassembly.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/apps/Elsa.ServerAndStudio.Web/Program.cs b/src/apps/Elsa.ServerAndStudio.Web/Program.cs
index 581f25ec5..fb43aa4cd 100644
--- a/src/apps/Elsa.ServerAndStudio.Web/Program.cs
+++ b/src/apps/Elsa.ServerAndStudio.Web/Program.cs
@@ -130,7 +130,11 @@ services
                 if (useCaching)
                     http.UseCache();
 
-                http.ConfigureHttpOptions = options => configuration.GetSection("Http").Bind(options);
+                http.ConfigureHttpOptions = options =>
+                {
+                    options.BaseUrl = new Uri(configuration["Hosting:BaseUrl"]!);
+                    options.BasePath = configuration["Http:BasePath"];
+                };
             })
             .UseEmail(email => email.ConfigureOptions = options => configuration.GetSection("Smtp").Bind(options))
             .UseWebhooks(webhooks => webhooks.ConfigureSinks = options => builder.Configuration.GetSection("Webhooks:Sinks").Bind(options))
diff --git a/src/apps/Elsa.ServerAndStudio.Web/appsettings.json b/src/apps/Elsa.ServerAndStudio.Web/appsettings.json
index 0e85580b3..56cfb0e9c 100644
--- a/src/apps/Elsa.ServerAndStudio.Web/appsettings.json
+++ b/src/apps/Elsa.ServerAndStudio.Web/appsettings.json
@@ -18,7 +18,7 @@
   "DatabaseProvider": "Sqlite",
   "Hosting": {
     "BaseUrl": "https://localhost:8080",
-    "BasePath": ""
+    "ApiUrl": "https://localhost:8080/elsa/api"
   },
   "Identity": {
     "Tokens": {
@@ -81,7 +81,6 @@
     "DefaultSender": "noreply@crmservices.com"
   },
   "Http": {
-    "BaseUrl": "https://localhost:5001",
     "BasePath": "/api/workflows"
   },
   "Webhooks": {
