diff --git a/src/DurableTask.AzureStorage/EntityTrackingStoreQueries.cs b/src/DurableTask.AzureStorage/EntityTrackingStoreQueries.cs
index dead69db6..3ba243908 100644
--- a/src/DurableTask.AzureStorage/EntityTrackingStoreQueries.cs
+++ b/src/DurableTask.AzureStorage/EntityTrackingStoreQueries.cs
@@ -140,6 +140,7 @@ async ValueTask<List<EntityMetadata>> ConvertResultsAsync(IEnumerable<Orchestrat
             do
             {
                 DurableStatusQueryResult page = await this.trackingStore.GetStateAsync(condition, 100, continuationToken, cancellation);
+                continuationToken = page.ContinuationToken;
 
                 var tasks = new List<Task>();
                 foreach (OrchestrationState state in page.OrchestrationState)
diff --git a/src/DurableTask.Core/Logging/LogEvents.cs b/src/DurableTask.Core/Logging/LogEvents.cs
index ebf489ded..3c5ff995a 100644
--- a/src/DurableTask.Core/Logging/LogEvents.cs
+++ b/src/DurableTask.Core/Logging/LogEvents.cs
@@ -1252,8 +1252,8 @@ public EntityBatchExecuted(EntityBatchRequest request, EntityBatchResult result)
             public int EntityStateLength { get; }
 
             public override EventId EventId => new EventId(
-                EventIds.EntityBatchExecuting,
-                nameof(EventIds.EntityBatchExecuting));
+                EventIds.EntityBatchExecuted,
+                nameof(EventIds.EntityBatchExecuted));
 
             public override LogLevel Level => LogLevel.Information;
 
diff --git a/src/DurableTask.Core/TaskHubWorker.cs b/src/DurableTask.Core/TaskHubWorker.cs
index 5a45752c6..76883e5ce 100644
--- a/src/DurableTask.Core/TaskHubWorker.cs
+++ b/src/DurableTask.Core/TaskHubWorker.cs
@@ -122,7 +122,7 @@ public TaskHubWorker(
                 orchestrationObjectManager,
                 activityObjectManager,
                 new NameVersionObjectManager<TaskEntity>(),
-                loggerFactory: null)
+                loggerFactory)
         {
         }