diff --git a/src/OpenFeature.Hosting/FeatureLifecycleStateOptions.cs b/src/OpenFeature.Hosting/FeatureLifecycleStateOptions.cs
index 91e3047d8..4e3c1c334 100644
--- a/src/OpenFeature.Hosting/FeatureLifecycleStateOptions.cs
+++ b/src/OpenFeature.Hosting/FeatureLifecycleStateOptions.cs
@@ -14,5 +14,5 @@ public class FeatureLifecycleStateOptions
     /// <summary>
     /// Gets or sets the state during the feature shutdown lifecycle.
     /// </summary>
-    public FeatureStopState StopState { get; set; } = FeatureStopState.Stopping;
+    public FeatureStopState StopState { get; set; } = FeatureStopState.Stopped;
 }
diff --git a/src/OpenFeature.Hosting/OpenFeatureBuilderExtensions.cs b/src/OpenFeature.Hosting/OpenFeatureBuilderExtensions.cs
index 16f437b39..80e760d9d 100644
--- a/src/OpenFeature.Hosting/OpenFeatureBuilderExtensions.cs
+++ b/src/OpenFeature.Hosting/OpenFeatureBuilderExtensions.cs
@@ -19,15 +19,7 @@ public static partial class OpenFeatureBuilderExtensions
     /// <returns>The <see cref="OpenFeatureBuilder"/> instance.</returns>
     public static OpenFeatureBuilder AddHostedFeatureLifecycle(this OpenFeatureBuilder builder, Action<FeatureLifecycleStateOptions>? configureOptions = null)
     {
-        if (configureOptions == null)
-        {
-            builder.Services.Configure<FeatureLifecycleStateOptions>(cfg =>
-            {
-                cfg.StartState = FeatureStartState.Starting;
-                cfg.StopState = FeatureStopState.Stopping;
-            });
-        }
-        else
+        if (configureOptions is not null)
         {
             builder.Services.Configure(configureOptions);
         }