diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs
index 70d39969..a3a88c9b 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs
@@ -4,7 +4,5 @@ public class ApiOptions
 {
     public const string SectionName = "Api";
 
-    public string BaseUrl { get; set; } = string.Empty;
-
     public bool UsePredefinedReports { get; set; } = false;
 }
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs
index dbe97b7a..d21cf620 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs
@@ -32,6 +32,7 @@ builder.Services.AddScoped<EnvelopeReceiverService>();
 builder.Services.AddScoped<SignatureService>();
 builder.Services.AddScoped<SignatureCacheService>();
 builder.Services.AddSingleton<AppVersionService>();
+builder.Services.AddScoped<EnvelopeService>();
 
 // DevExpress WASM
 builder.Services.AddDevExpressWebAssemblyBlazorPdfViewer();
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocReceiverElementService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocReceiverElementService.cs
index b64e242e..8b3f01f0 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocReceiverElementService.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocReceiverElementService.cs
@@ -1,18 +1,16 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using EnvelopeGenerator.Server.Client.Models;
-using EnvelopeGenerator.Server.Client.Options;
-using Microsoft.Extensions.Options;
 
 namespace EnvelopeGenerator.Server.Client.Services;
 
-public class DocReceiverElementService(HttpClient http, IOptions<ApiOptions> apiOptions)
+public class DocReceiverElementService(HttpClient http)
 {
     private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web);
 
     public async Task<IReadOnlyList<SignatureDto>> GetAsync(string envelopeKey, CancellationToken cancel = default)
     {
-        var url = $"{apiOptions.Value.BaseUrl}/api/DocReceiverElement/{Uri.EscapeDataString(envelopeKey)}";
+        var url = $"/api/DocReceiverElement/{Uri.EscapeDataString(envelopeKey)}";
         var response = await http.GetAsync(url, cancel);
 
         if (!response.IsSuccessStatusCode)
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeService.cs
index fcfb26bd..f459a5e3 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeService.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeService.cs
@@ -1,28 +1,17 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Server.Client.Models;
-using EnvelopeGenerator.Server.Client.Options;
 using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Options;
 
 namespace EnvelopeGenerator.Server.Client.Services;
 
 /// <summary>
 /// Retrieves <see cref="EnvelopeDto"/>s from the API.
 /// </summary>
-public class EnvelopeService
+public class EnvelopeService(HttpClient http)
 {
-    private readonly HttpClient _http;
-    private readonly ApiOptions _apiOptions;
     private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web);
 
-    public EnvelopeService(HttpClient http, IOptions<ApiOptions> apiOptions)
-    {
-        _http = http;
-        _apiOptions = apiOptions.Value;
-    }
-
     /// <summary>
     /// Fetches envelopes from the API with optional filters.
     /// </summary>
@@ -34,7 +23,7 @@ public class EnvelopeService
         bool? onlyCompleted = null,
         CancellationToken cancel = default)
     {
-        var baseUrl = $"{_apiOptions.BaseUrl}/api/Envelope";
+        var baseUrl = $"/api/Envelope";
         var queryParams = new Dictionary<string, string?>();
 
         if (id.HasValue)
@@ -56,7 +45,7 @@ public class EnvelopeService
 
         var url = QueryHelpers.AddQueryString(baseUrl, queryParams);
 
-        var response = await _http.GetAsync(url, cancel);
+        var response = await http.GetAsync(url, cancel);
 
         if (!response.IsSuccessStatusCode)
         {