diff --git a/API/Controllers/MangaController.cs b/API/Controllers/MangaController.cs
index 6cc8636..60f7443 100644
--- a/API/Controllers/MangaController.cs
+++ b/API/Controllers/MangaController.cs
@@ -443,10 +443,13 @@ public class MangaController(MangaContext context) : Controller
     [ProducesResponseType<string>(Status404NotFound, "text/plain")]
     public async Task<Results<Ok, NotFound<string>>> ChangeLibrary(string MangaId, string LibraryId)
     {
-        if (await context.MangaIncludeAll().FirstOrDefaultAsync(m => m.Key == MangaId, HttpContext.RequestAborted) is not { } manga)
+        if (await context.Mangas.FirstOrDefaultAsync(m => m.Key == MangaId, HttpContext.RequestAborted) is not { } manga)
             return TypedResults.NotFound(nameof(MangaId));
         if (await context.FileLibraries.FirstOrDefaultAsync(l => l.Key == LibraryId, HttpContext.RequestAborted) is not { } library)
             return TypedResults.NotFound(nameof(LibraryId));
+        
+        if(manga.LibraryId == library.Key)
+            return TypedResults.Ok();
 
         MoveMangaLibraryWorker moveLibrary = new(manga, library);
         
diff --git a/API/Workers/MoveMangaLibraryWorker.cs b/API/Workers/MoveMangaLibraryWorker.cs
index 4c978f1..40d1cf0 100644
--- a/API/Workers/MoveMangaLibraryWorker.cs
+++ b/API/Workers/MoveMangaLibraryWorker.cs
@@ -33,7 +33,7 @@ public class MoveMangaLibraryWorker(Manga manga, FileLibrary toLibrary, IEnumera
         // Save old Path (to later move chapters)
         Dictionary<Chapter, string> oldPath = manga.Chapters.ToDictionary(c => c, c => c.FullArchiveFilePath);
         // Set new Path
-        DbContext.Entry(manga).Property(m => m.Library).CurrentValue = toLibrary;
+        manga.Library = toLibrary;
         
         if (await DbContext.Sync(CancellationToken) is { success: false })
             return [];