diff --git a/src/Besql/Bit.Besql/IServiceCollectionBesqlExtentions.cs b/src/Besql/Bit.Besql/IServiceCollectionBesqlExtentions.cs
index ded8f5e149..195b27a22e 100644
--- a/src/Besql/Bit.Besql/IServiceCollectionBesqlExtentions.cs
+++ b/src/Besql/Bit.Besql/IServiceCollectionBesqlExtentions.cs
@@ -52,7 +52,13 @@ public static IServiceCollection AddBesqlDbContextFactory<TDbContext>(this IServ
         else
         {
             services.TryAddSingleton<IBitBesqlStorage, BitBesqlNoopStoage>();
-            services.AddDbContextFactory<TDbContext, PooledDbContextFactoryBase<TDbContext>>(optionsAction);
+            services.AddDbContextFactory<TDbContext, PooledDbContextFactoryBase<TDbContext>>((serviceProvider, options) =>
+            {
+#if NET9_0_OR_GREATER
+                options.ReplaceService<IHistoryRepository, BesqlHistoryRepository>();
+#endif
+                optionsAction.Invoke(serviceProvider, options);
+            });
         }
 
         return services;