Index: Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs
===================================================================
diff -u -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs	(.../IStorableExtensions.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs	(.../IStorableExtensions.cs)	(revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4)
@@ -21,7 +21,8 @@
 
 using System;
 using System.Data.Entity;
-using System.Linq;
+
+using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Exceptions;
 using Application.Ringtoets.Storage.Properties;
 using Core.Common.Base.Storage;
@@ -48,29 +49,38 @@
         /// </summary>
         /// <param name="storable">The <see cref="IStorable"/> corresponding with the Entity.</param>
         /// <param name="entitySet">The Entity set to obtain the existing entity from.</param>
-        /// <param name="getId">The function to obtain the id field of the Entity.</param>
+        /// <param name="context"></param>
         /// <returns>The stored <see cref="IStorable"/> as an Entity of type <typeparamref name="T"/>.</returns>
         /// <exception cref="EntityNotFoundException">Thrown when either:
         /// <list type="bullet">
         /// <item>the Entity of type <typeparamref name="T"/> couldn't be found in the <paramref name="entitySet"/></item>
         /// <item>more than one Entity of type <typeparamref name="T"/> was found in the <paramref name="entitySet"/></item>
         /// <item><see cref="storable"/> has not yet been saved in the database</item>
         /// </list></exception>
-        public static T GetCorrespondingEntity<T>(this IStorable storable, DbSet<T> entitySet, Func<T, long> getId) where T : class
+        public static T GetCorrespondingEntity<T>(this IStorable storable, DbSet<T> entitySet, IRingtoetsEntities context) where T : class
         {
             if (storable.IsNew())
             {
                 throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(T).Name, storable.StorageId));
             }
             try
             {
-                Func<T, bool> expression = sle => getId(sle) == storable.StorageId;
-                return entitySet.Single(expression);
+                context.AutoDetectChangesEnabled = false;
+                T entity = entitySet.Find(storable.StorageId);
+                if (entity == null)
+                {
+                    throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(T).Name, storable.StorageId));
+                }
+                return entity;
             }
             catch (InvalidOperationException exception)
             {
                 throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(T).Name, storable.StorageId), exception);
             }
+            finally
+            {
+                context.AutoDetectChangesEnabled = true;
+            }
         }
     }
 }
\ No newline at end of file