diff --git a/Chapter-2-modules-separation/Src/Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs b/Chapter-2-modules-separation/Src/Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs
index a2646a75..ef874d39 100644
--- a/Chapter-2-modules-separation/Src/Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs
+++ b/Chapter-2-modules-separation/Src/Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs
@@ -11,7 +11,7 @@ public static bool IsModuleEnabled(this IServiceCollection services, string modu
         var buildServiceProvider = services.BuildServiceProvider();
         var featureManager = buildServiceProvider.GetRequiredService<IFeatureManager>();
 
-        return featureManager.IsEnabledAsync(module).Result;
+        return featureManager.IsEnabledAsync(module).GetAwaiter().GetResult();
     }
 
     public static bool IsModuleEnabled(this IApplicationBuilder applicationBuilder, string module)
@@ -19,6 +19,6 @@ public static bool IsModuleEnabled(this IApplicationBuilder applicationBuilder,
         var buildServiceProvider = applicationBuilder.ApplicationServices;
         var featureManager = buildServiceProvider.GetRequiredService<IFeatureManager>();
 
-        return featureManager.IsEnabledAsync(module).Result;
+        return featureManager.IsEnabledAsync(module).GetAwaiter().GetResult();
     }
 }
diff --git a/Chapter-3-microservice-extraction/Fitnet.Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs b/Chapter-3-microservice-extraction/Fitnet.Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs
index a2646a75..ef874d39 100644
--- a/Chapter-3-microservice-extraction/Fitnet.Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs
+++ b/Chapter-3-microservice-extraction/Fitnet.Common/Fitnet.Common.Infrastructure/Modules/ModuleAvailabilityChecker.cs
@@ -11,7 +11,7 @@ public static bool IsModuleEnabled(this IServiceCollection services, string modu
         var buildServiceProvider = services.BuildServiceProvider();
         var featureManager = buildServiceProvider.GetRequiredService<IFeatureManager>();
 
-        return featureManager.IsEnabledAsync(module).Result;
+        return featureManager.IsEnabledAsync(module).GetAwaiter().GetResult();
     }
 
     public static bool IsModuleEnabled(this IApplicationBuilder applicationBuilder, string module)
@@ -19,6 +19,6 @@ public static bool IsModuleEnabled(this IApplicationBuilder applicationBuilder,
         var buildServiceProvider = applicationBuilder.ApplicationServices;
         var featureManager = buildServiceProvider.GetRequiredService<IFeatureManager>();
 
-        return featureManager.IsEnabledAsync(module).Result;
+        return featureManager.IsEnabledAsync(module).GetAwaiter().GetResult();
     }
 }