diff --git a/FreeTubeSync/EndPoints/HistoryEndpoint.cs b/FreeTubeSync/EndPoints/HistoryEndpoint.cs
index 7f6d0d0..d57c233 100644
--- a/FreeTubeSync/EndPoints/HistoryEndpoint.cs
+++ b/FreeTubeSync/EndPoints/HistoryEndpoint.cs
@@ -20,7 +20,10 @@ public static class HistoryEndpoint
             if (results == null)
                 await repository.AddAsync(history, ct);
             else
-                await repository.UpdateAsync(history, ct);
+            {
+                results.Update(history);
+                await repository.UpdateAsync(results, ct);
+            }
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/PlaylistEndpoint.cs b/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
index a7a962f..383d8da 100644
--- a/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
+++ b/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
@@ -20,7 +20,11 @@ public static class PlaylistEndpoint
             if (results == null)
                 await repository.AddAsync(playlist, ct);
             else
-                await repository.UpdateAsync(playlist, ct);
+            {
+                results.Update(playlist);
+                await repository.UpdateAsync(results, ct);
+            }
+
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/ProfileEndpoint.cs b/FreeTubeSync/EndPoints/ProfileEndpoint.cs
index 17b298c..80fc531 100644
--- a/FreeTubeSync/EndPoints/ProfileEndpoint.cs
+++ b/FreeTubeSync/EndPoints/ProfileEndpoint.cs
@@ -20,7 +20,11 @@ public static class ProfileEndpoint
             if (res == null)
                 await repository.AddAsync(profile, ct);
             else
-                await repository.UpdateAsync(profile, ct);
+            {
+                res.Update(profile);
+                await repository.UpdateAsync(res, ct);
+            }
+
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs b/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
index 8908ddc..5948186 100644
--- a/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
+++ b/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
@@ -17,10 +17,14 @@ public static class SearchHistoryEndpoint
         group.MapPost("/", async (IRepository<SearchHistory> repository, CancellationToken ct, SearchHistory history) =>
         {
             var result = await repository.GetByIdAsync(history._id, ct);
-            if (result != null)
-                await repository.UpdateAsync(history, ct);
-            else
+            if (result == null)
                 await repository.AddAsync(history, ct);
+            else
+            {
+                result.Update(history);
+                await repository.UpdateAsync(result, ct);
+            }
+
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/SettingEndpoint.cs b/FreeTubeSync/EndPoints/SettingEndpoint.cs
index fdb9dc8..1b053f0 100644
--- a/FreeTubeSync/EndPoints/SettingEndpoint.cs
+++ b/FreeTubeSync/EndPoints/SettingEndpoint.cs
@@ -22,7 +22,10 @@ public static class SettingEndpoint
             if (res == null)
                 await repository.AddAsync(setting, ct);
             else
-                await repository.UpdateAsync(setting, ct);
+            {
+                res.Update(setting);
+                await repository.UpdateAsync(res, ct);
+            }
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/Model/Playlist.cs b/FreeTubeSync/Model/Playlist.cs
index 2d1627e..6f2abb7 100644
--- a/FreeTubeSync/Model/Playlist.cs
+++ b/FreeTubeSync/Model/Playlist.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace FreeTubeSync.Model;
 
@@ -18,7 +19,20 @@ public class Playlist
     {
         if (other.playlistName != playlistName) playlistName = other.playlistName;
         if (other.@protected != @protected) @protected = other.@protected;
-        if (other.videos.Count != videos.Count) videos = other.videos;
+        var remove = new List<Video>();
+        foreach (var vid in videos)
+        {
+            if (other.videos.Any(x => x.playlistItemId == vid.playlistItemId)) continue;
+            remove.Add(vid);
+        }
+        videos.RemoveAll(x => remove.Contains(x));
+        remove.Clear();
+        foreach (var vid in other.videos)
+        {
+            if (videos.Any(x => x.playlistItemId == vid.playlistItemId)) continue;
+            remove.Add(vid);
+        }
+        videos.AddRange(remove);
         if (other.createdAt != createdAt) createdAt = other.createdAt;
         if (other.lastUpdatedAt != lastUpdatedAt) lastUpdatedAt = other.lastUpdatedAt;
     }
diff --git a/FreeTubeSync/Model/Profile.cs b/FreeTubeSync/Model/Profile.cs
index 22d7608..e07c324 100644
--- a/FreeTubeSync/Model/Profile.cs
+++ b/FreeTubeSync/Model/Profile.cs
@@ -18,6 +18,19 @@ public class Profile
         if (other.name != name) name = other.name;
         if (other.bgColor != bgColor) bgColor = other.bgColor;
         if (other.textColor != textColor) textColor = other.textColor;
-        if (other.subscriptions.Count != subscriptions.Count) subscriptions = other.subscriptions;
+        var remove = new List<Subscription>();
+        foreach (var sub in subscriptions)
+        {
+            if (other.subscriptions.Any(x => x.id == sub.id)) continue;
+            remove.Add(sub);
+        }
+        subscriptions.RemoveAll(x => remove.Contains(x));
+        remove.Clear();
+        foreach (var sub in other.subscriptions)
+        {
+            if (subscriptions.Any(x => x.id == sub.id)) continue;
+            remove.Add(sub);
+        }
+        subscriptions.AddRange(remove);
     }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Setting.cs b/FreeTubeSync/Model/Setting.cs
index 2e4220f..42acf6a 100644
--- a/FreeTubeSync/Model/Setting.cs
+++ b/FreeTubeSync/Model/Setting.cs
@@ -22,4 +22,9 @@ public class Setting
 #pragma warning restore CS8603
         set => ValueJson = JsonSerializer.Serialize(value);
     }
+
+    public void Update(Setting other)
+    {
+        Value = other.Value;
+    }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Subscription.cs b/FreeTubeSync/Model/Subscription.cs
index 6f026b6..7f330c9 100644
--- a/FreeTubeSync/Model/Subscription.cs
+++ b/FreeTubeSync/Model/Subscription.cs
@@ -10,4 +10,10 @@ public class Subscription
     public required string id { get; set; }
     public required string name { get; set; }
     public string? thumbnail { get; set; }
+
+    public void Update(Subscription other)
+    {
+        name = other.name;
+        thumbnail = other.thumbnail;
+    }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Video.cs b/FreeTubeSync/Model/Video.cs
index 0fd1c08..435b33b 100644
--- a/FreeTubeSync/Model/Video.cs
+++ b/FreeTubeSync/Model/Video.cs
@@ -16,4 +16,16 @@ public class Video
     public long timeAdded { get; set; }
     [Key] public string playlistItemId { get; set; } = string.Empty;
     public string type { get; set; } = string.Empty;
+
+    public void Update(Video other)
+    {
+        videoId = other.videoId;
+        title = other.title;
+        author = other.author;
+        authorId = other.authorId;
+        lengthSeconds = other.lengthSeconds;
+        pubished = other.pubished;
+        timeAdded = other.timeAdded;
+        type = other.type;
+    }
 }
\ No newline at end of file