diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index f7da0d7..71d6025 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -5,6 +5,7 @@ using Elwig.Helpers.Weighing;
 using Elwig.Models.Entities;
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
@@ -1004,6 +1005,9 @@ namespace Elwig.Windows {
             };
 
             try {
+                if (oldDelivery != null && ctx.Entry(oldDelivery) is EntityEntry<Delivery> entry) {
+                    entry.State = EntityState.Detached;
+                }
                 if (IsEditing || !deliveryNew) {
                     ctx.Update(d);
                 } else {