diff --git a/src/Azure/Orleans.Reminders.Cosmos/CosmosReminderTable.cs b/src/Azure/Orleans.Reminders.Cosmos/CosmosReminderTable.cs
index ebeeb9466d1..16040da2579 100644
--- a/src/Azure/Orleans.Reminders.Cosmos/CosmosReminderTable.cs
+++ b/src/Azure/Orleans.Reminders.Cosmos/CosmosReminderTable.cs
@@ -356,6 +356,7 @@ private ReminderEntity ToEntity(ReminderEntry entry)
         return new ReminderEntity
         {
             Id = ReminderEntity.ConstructId(entry.GrainId, entry.ReminderName),
+            ETag = entry.ETag,
             PartitionKey = ReminderEntity.ConstructPartitionKey(_clusterOptions.ServiceId, entry.GrainId),
             ServiceId = _clusterOptions.ServiceId,
             GrainHash = entry.GrainId.GetUniformHashCode(),
diff --git a/test/Orleans.Runtime.Internal.Tests/RemindersTest/ReminderTableTestsBase.cs b/test/Orleans.Runtime.Internal.Tests/RemindersTest/ReminderTableTestsBase.cs
index c27f9236d5a..93fb654372a 100644
--- a/test/Orleans.Runtime.Internal.Tests/RemindersTest/ReminderTableTestsBase.cs
+++ b/test/Orleans.Runtime.Internal.Tests/RemindersTest/ReminderTableTestsBase.cs
@@ -93,6 +93,7 @@ protected async Task ReminderSimple()
             Assert.Equal(readReminder.StartAt, reminder.StartAt);
             Assert.NotNull(etagTemp);
 
+            reminder.StartAt = reminder.StartAt.AddSeconds(1);
             reminder.ETag = await remindersTable.UpsertRow(reminder);
 
             var removeRowRes = await remindersTable.RemoveRow(reminder.GrainId, reminder.ReminderName, etagTemp);