diff --git a/DiscImageChef.Core/Remote.cs b/DiscImageChef.Core/Remote.cs
index 44f312f78..b23627dfa 100644
--- a/DiscImageChef.Core/Remote.cs
+++ b/DiscImageChef.Core/Remote.cs
@@ -284,11 +284,15 @@ namespace DiscImageChef.Core
                         if(existing != null)
                         {
                             modifiedDevices++;
+
+                            mctx.Remove(existing);
+
                             existing = new Device(device)
                             {
                                 Id = device.Id, OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead
                             };
-                            mctx.Devices.Update(existing);
+
+                            mctx.Devices.Add(existing);
                         }
                         else
                         {