diff --git a/src/NServiceBus.Persistence.AzureTable/SagaPersisters/AzureSagaPersister.cs b/src/NServiceBus.Persistence.AzureTable/SagaPersisters/AzureSagaPersister.cs
index 6388e929..76ea4788 100644
--- a/src/NServiceBus.Persistence.AzureTable/SagaPersisters/AzureSagaPersister.cs
+++ b/src/NServiceBus.Persistence.AzureTable/SagaPersisters/AzureSagaPersister.cs
@@ -52,7 +52,7 @@ public async Task Save(IContainSagaData sagaData, SagaCorrelationProperty correl
             sagaDataEntityToSave.Table = table;
 
             var meta = context.GetOrCreate<SagaInstanceMetadata>();
-            meta.Entities[sagaData] = sagaDataEntityToSave;
+            meta.Entities[sagaData.Id] = sagaDataEntityToSave;
 
             storageSession.Add(new SagaSave(partitionKey, sagaDataEntityToSave));
         }
@@ -63,7 +63,7 @@ public Task Update(IContainSagaData sagaData, SynchronizedStorageSession session
             var partitionKey = GetPartitionKey(context, sagaData.Id);
 
             var meta = context.GetOrCreate<SagaInstanceMetadata>();
-            var sagaDataEntityToUpdate = meta.Entities[sagaData];
+            var sagaDataEntityToUpdate = meta.Entities[sagaData.Id];
 
             var sagaAsDictionaryTableEntity = DictionaryTableEntityExtensions.ToDictionaryTableEntity(sagaData, sagaDataEntityToUpdate, jsonSerializer, writerCreator);
 
@@ -99,7 +99,7 @@ public async Task<TSagaData> Get<TSagaData>(Guid sagaId, SynchronizedStorageSess
 
             var sagaData = DictionaryTableEntityExtensions.ToSagaData<TSagaData>(readSagaDataEntity, jsonSerializer, readerCreator);
             var meta = context.GetOrCreate<SagaInstanceMetadata>();
-            meta.Entities[sagaData] = readSagaDataEntity;
+            meta.Entities[sagaData.Id] = readSagaDataEntity;
             return sagaData;
         }
 
@@ -181,7 +181,7 @@ public Task Complete(IContainSagaData sagaData, SynchronizedStorageSession sessi
         {
             var storageSession = (StorageSession)session;
             var meta = context.GetOrCreate<SagaInstanceMetadata>();
-            var sagaDataEntityToDelete = meta.Entities[sagaData];
+            var sagaDataEntityToDelete = meta.Entities[sagaData.Id];
             var partitionKey = GetPartitionKey(context, sagaData.Id);
 
             storageSession.Add(new SagaDelete(partitionKey, sagaDataEntityToDelete));
@@ -228,7 +228,7 @@ static TableEntityPartitionKey GetPartitionKey(ContextBag context, Guid sagaData
         /// </summary>
         class SagaInstanceMetadata
         {
-            public Dictionary<object, DictionaryTableEntity> Entities { get; } = new Dictionary<object, DictionaryTableEntity>();
+            public Dictionary<Guid, DictionaryTableEntity> Entities { get; } = new Dictionary<Guid, DictionaryTableEntity>();
         }
     }