diff --git a/src/WorkflowCore/Services/ActivityController.cs b/src/WorkflowCore/Services/ActivityController.cs
index e37481521..491f9c47e 100644
--- a/src/WorkflowCore/Services/ActivityController.cs
+++ b/src/WorkflowCore/Services/ActivityController.cs
@@ -34,7 +34,7 @@ public async Task<PendingActivity> GetPendingActivity(string activityName, strin
             {
                 if (!firstPass)
                     await Task.Delay(100);
-                subscription = await _subscriptionRepository.GetFirstOpenSubscription(Event.EventTypeActivity, activityName, _dateTimeProvider.Now);
+                subscription = await _subscriptionRepository.GetFirstOpenSubscription(Event.EventTypeActivity, activityName, _dateTimeProvider.UtcNow);
                 if (subscription != null)
                     if (!await _lockProvider.AcquireLock($"sub:{subscription.Id}", CancellationToken.None))
                         subscription = null;
@@ -51,7 +51,7 @@ public async Task<PendingActivity> GetPendingActivity(string activityName, strin
                     Token = token.Encode(),
                     ActivityName = subscription.EventKey,
                     Parameters = subscription.SubscriptionData,
-                    TokenExpiry = DateTime.MaxValue
+                    TokenExpiry = new DateTime(DateTime.MaxValue.Ticks, DateTimeKind.Utc)
                 };
 
                 if (!await _subscriptionRepository.SetSubscriptionToken(subscription.Id, result.Token, workerId, result.TokenExpiry))