diff --git a/LibPostalApi/Program.cs b/LibPostalApi/Program.cs
index 568e9d5..f4276d5 100644
--- a/LibPostalApi/Program.cs
+++ b/LibPostalApi/Program.cs
@@ -33,7 +33,7 @@
 app.MapHealthChecks("/health");
 app.Use(async (context, next) =>
 {
-    if (context.Request.Path.StartsWithSegments("/health"))
+    if (LibPostalService.Initialized && context.Request.Path.StartsWithSegments("/health"))
     {
         var libPostal = app.Services.GetRequiredService<ILibPostalService>();
         var testParse = libPostal.ParseAddress(TestData.TestAddress);
diff --git a/LibPostalApi/Services/LibPostalService.cs b/LibPostalApi/Services/LibPostalService.cs
index de1f7ba..b498a3f 100644
--- a/LibPostalApi/Services/LibPostalService.cs
+++ b/LibPostalApi/Services/LibPostalService.cs
@@ -7,6 +7,7 @@ namespace LibPostalApi.Services;
 
 public class LibPostalService : ILibPostalService
 {
+    public static bool Initialized = false;
     private readonly LibPostal _libPostal;
     public LibPostalService(IConfiguration config)
     {
@@ -21,6 +22,7 @@ public LibPostalService(IConfiguration config)
         _libPostal.LoadParser();
         _libPostal.LoadLanguageClassifier();
         _libPostal.PrintFeatures = true;
+        Initialized = true;
     }
 
     public (AddressParserResponse[]? Results, int Successes, int Failures) ParseAddress(List<string> addresses, ParseOptions? dtoOptions)