diff --git a/src/AssociationRegistry.Admin.Api/AssociationRegistry.Admin.Api.csproj b/src/AssociationRegistry.Admin.Api/AssociationRegistry.Admin.Api.csproj
index 4b6614d54..134c259d1 100755
--- a/src/AssociationRegistry.Admin.Api/AssociationRegistry.Admin.Api.csproj
+++ b/src/AssociationRegistry.Admin.Api/AssociationRegistry.Admin.Api.csproj
@@ -58,6 +58,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\AssociationRegistry.Admin.Schema\AssociationRegistry.Admin.Schema.csproj" />
+    <ProjectReference Include="..\AssociationRegistry.Hosts\AssociationRegistry.Hosts.csproj" />
     <ProjectReference Include="..\AssociationRegistry.Magda\AssociationRegistry.Magda.csproj" />
     <ProjectReference Include="..\AssociationRegistry.OpenTelemetry\AssociationRegistry.OpenTelemetry.csproj" />
     <ProjectReference Include="..\AssociationRegistry\AssociationRegistry.csproj" />
diff --git a/src/AssociationRegistry.Admin.Api/Program.cs b/src/AssociationRegistry.Admin.Api/Program.cs
index 72978528d..aa600e5c7 100755
--- a/src/AssociationRegistry.Admin.Api/Program.cs
+++ b/src/AssociationRegistry.Admin.Api/Program.cs
@@ -22,6 +22,7 @@ namespace AssociationRegistry.Admin.Api;
 using Framework;
 using Grar;
 using GrarSync;
+using Hosts;
 using IdentityModel.AspNetCore.OAuth2Introspection;
 using Infrastructure;
 using Infrastructure.AWS;
@@ -49,6 +50,7 @@ namespace AssociationRegistry.Admin.Api;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
+using Nest;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
@@ -137,6 +139,10 @@ public static async Task Main(string[] args)
 
         await RunPreStartupTasks(app, logger);
 
+        await WaitFor.ElasticSearchToBecomeAvailable(
+            app.Services.GetRequiredService<ElasticClient>(),
+            app.Services.GetRequiredService<ILogger<Program>>());
+
         await app.RunOaktonCommands(args);
     }