diff --git a/src/EntityDb.Common/Extensions/ServiceCollectionExtensions.cs b/src/EntityDb.Common/Extensions/ServiceCollectionExtensions.cs
index 554e0401..d9c0d8ef 100644
--- a/src/EntityDb.Common/Extensions/ServiceCollectionExtensions.cs
+++ b/src/EntityDb.Common/Extensions/ServiceCollectionExtensions.cs
@@ -89,15 +89,18 @@ public static void AddEntity<TEntity>(this IServiceCollection serviceCollection)
     /// </summary>
     /// <param name="serviceCollection">The service collection.</param>
     /// <param name="snapshotSessionOptionsName">The agent's intent for the snapshot repository.</param>
-    /// <param name="synchronousMode">If <c>true</c> then snapshots will be synchronously recorded.</param>
+    /// <param name="testMode">If <c>true</c> then snapshots will be synchronously recorded.</param>
     /// <typeparam name="TEntity">The type of the entity.</typeparam>
     public static void AddEntitySnapshotTransactionSubscriber<TEntity>(this IServiceCollection serviceCollection,
-        string snapshotSessionOptionsName, bool synchronousMode = false)
+        string snapshotSessionOptionsName, bool testMode = false)
         where TEntity : IEntity<TEntity>, ISnapshot<TEntity>
     {
-        serviceCollection.AddSingleton<ITransactionSubscriber>(serviceProvider =>
-            EntitySnapshotTransactionSubscriber<TEntity>.Create(serviceProvider, snapshotSessionOptionsName,
-                synchronousMode));
+        serviceCollection.Add<ITransactionSubscriber>
+        (
+            testMode ? ServiceLifetime.Singleton : ServiceLifetime.Scoped,
+            serviceProvider => EntitySnapshotTransactionSubscriber<TEntity>.Create(serviceProvider, snapshotSessionOptionsName,
+                testMode)
+        );
     }
 
     /// <summary>
@@ -121,15 +124,18 @@ public static void AddProjection<TProjection, TProjectionStrategy>(
     /// </summary>
     /// <param name="serviceCollection">The service collection.</param>
     /// <param name="snapshotSessionOptionsName">The agent's intent for the snapshot repository.</param>
-    /// <param name="synchronousMode">If <c>true</c> then snapshots will be synchronously recorded.</param>
+    /// <param name="testMode">If <c>true</c> then snapshots will be synchronously recorded.</param>
     /// <typeparam name="TProjection">The type of the projection.</typeparam>
     public static void AddProjectionSnapshotTransactionSubscriber<TProjection>(
         this IServiceCollection serviceCollection,
-        string snapshotSessionOptionsName, bool synchronousMode = false)
+        string snapshotSessionOptionsName, bool testMode = false)
         where TProjection : IProjection<TProjection>, ISnapshot<TProjection>
     {
-        serviceCollection.AddSingleton<ITransactionSubscriber>(serviceProvider =>
-            ProjectionSnapshotTransactionSubscriber<TProjection>.Create(serviceProvider, snapshotSessionOptionsName,
-                synchronousMode));
+        serviceCollection.Add<ITransactionSubscriber>
+        (
+            testMode ? ServiceLifetime.Singleton : ServiceLifetime.Scoped,
+            serviceProvider => ProjectionSnapshotTransactionSubscriber<TProjection>.Create(serviceProvider, snapshotSessionOptionsName,
+                testMode)
+        );
     }
 }
diff --git a/src/EntityDb.Common/Transactions/EntitySnapshotTransactionSubscriber.cs b/src/EntityDb.Common/Transactions/EntitySnapshotTransactionSubscriber.cs
index f0a9f293..3bc4f2ca 100644
--- a/src/EntityDb.Common/Transactions/EntitySnapshotTransactionSubscriber.cs
+++ b/src/EntityDb.Common/Transactions/EntitySnapshotTransactionSubscriber.cs
@@ -20,8 +20,8 @@ public EntitySnapshotTransactionSubscriber
     (
         ISnapshotRepositoryFactory<TEntity> snapshotRepositoryFactory,
         string snapshotSessionOptionsName,
-        bool synchronousMode
-    ) : base(synchronousMode)
+        bool testMode
+    ) : base(testMode)
     {
         _snapshotRepositoryFactory = snapshotRepositoryFactory;
         _snapshotSessionOptionsName = snapshotSessionOptionsName;
@@ -63,10 +63,10 @@ protected override async Task NotifyAsync(ITransaction transaction)
     }
 
     public static EntitySnapshotTransactionSubscriber<TEntity> Create(IServiceProvider serviceProvider,
-        string snapshotSessionOptionsName, bool synchronousMode)
+        string snapshotSessionOptionsName, bool testMode)
     {
         return ActivatorUtilities.CreateInstance<EntitySnapshotTransactionSubscriber<TEntity>>(serviceProvider,
             snapshotSessionOptionsName,
-            synchronousMode);
+            testMode);
     }
 }
diff --git a/src/EntityDb.Common/Transactions/ProjectionSnapshotTransactionSubscriber.cs b/src/EntityDb.Common/Transactions/ProjectionSnapshotTransactionSubscriber.cs
index 750b4daf..2d1c01ec 100644
--- a/src/EntityDb.Common/Transactions/ProjectionSnapshotTransactionSubscriber.cs
+++ b/src/EntityDb.Common/Transactions/ProjectionSnapshotTransactionSubscriber.cs
@@ -26,8 +26,8 @@ public ProjectionSnapshotTransactionSubscriber
         IProjectionStrategy<TProjection> projectionStrategy,
         ISnapshotRepositoryFactory<TProjection> snapshotRepositoryFactory,
         string snapshotSessionOptionsName,
-        bool synchronousMode
-    ) : base(synchronousMode)
+        bool testMode
+    ) : base(testMode)
     {
         _projectionStrategy = projectionStrategy;
         _snapshotRepositoryFactory = snapshotRepositoryFactory;
@@ -77,10 +77,10 @@ protected override async Task NotifyAsync(ITransaction transaction)
     }
 
     public static ProjectionSnapshotTransactionSubscriber<TProjection> Create(IServiceProvider serviceProvider,
-        string snapshotSessionOptionsName, bool synchronousMode)
+        string snapshotSessionOptionsName, bool testMode)
     {
         return ActivatorUtilities.CreateInstance<ProjectionSnapshotTransactionSubscriber<TProjection>>(serviceProvider,
             snapshotSessionOptionsName,
-            synchronousMode);
+            testMode);
     }
 }
diff --git a/src/EntityDb.Common/Transactions/TransactionSubscriber.cs b/src/EntityDb.Common/Transactions/TransactionSubscriber.cs
index 43d96b7a..23f02a7f 100644
--- a/src/EntityDb.Common/Transactions/TransactionSubscriber.cs
+++ b/src/EntityDb.Common/Transactions/TransactionSubscriber.cs
@@ -8,15 +8,15 @@ namespace EntityDb.Common.Transactions;
 /// </summary>
 public abstract class TransactionSubscriber : ITransactionSubscriber
 {
-    private readonly bool _synchronousMode;
+    private readonly bool _testMode;
 
     /// <summary>
     ///     Constructs a new instance of <see cref="TransactionSubscriber" />.
     /// </summary>
-    /// <param name="synchronousMode">If <c>true</c> then the task will be synchronously awaited before returning.</param>
-    protected TransactionSubscriber(bool synchronousMode)
+    /// <param name="testMode">If <c>true</c> then the task will be synchronously awaited before returning.</param>
+    protected TransactionSubscriber(bool testMode)
     {
-        _synchronousMode = synchronousMode;
+        _testMode = testMode;
     }
 
     /// <inheritdoc cref="ITransactionSubscriber.Notify(ITransaction)" />
@@ -24,7 +24,7 @@ public void Notify(ITransaction transaction)
     {
         var task = Task.Run(async () => await NotifyAsync(transaction).ConfigureAwait(false));
 
-        if (_synchronousMode)
+        if (_testMode)
         {
             task.Wait();
         }