diff --git a/src/Readarr.Api.V1/Books/BookController.cs b/src/Readarr.Api.V1/Books/BookController.cs
index bd7762d57..935714d7a 100644
--- a/src/Readarr.Api.V1/Books/BookController.cs
+++ b/src/Readarr.Api.V1/Books/BookController.cs
@@ -167,7 +167,7 @@ namespace Readarr.Api.V1.Books
             var model = bookResource.ToModel(book);
 
             _bookService.UpdateBook(model);
-            _editionService.UpdateMany(model.Editions.Value);
+            _editionService.UpdateMany(model.Editions.Value ?? new List<Edition>());
 
             BroadcastResourceChange(ModelAction.Updated, model.Id);
 
diff --git a/src/Readarr.Api.V1/Books/BookResource.cs b/src/Readarr.Api.V1/Books/BookResource.cs
index db49b06bb..4670cf38a 100644
--- a/src/Readarr.Api.V1/Books/BookResource.cs
+++ b/src/Readarr.Api.V1/Books/BookResource.cs
@@ -50,7 +50,7 @@ namespace Readarr.Api.V1.Books
                 return null;
             }
 
-            var selectedEdition = model.Editions?.Value.Where(x => x.Monitored).SingleOrDefault();
+            var selectedEdition = model.Editions?.Value?.SingleOrDefault(x => x.Monitored);
 
             var title = selectedEdition?.Title ?? model.Title;
             var authorTitle = $"{model.Author?.Value?.Metadata?.Value?.SortNameLastFirst} {title}";
@@ -123,7 +123,7 @@ namespace Readarr.Api.V1.Books
 
         public static List<Book> ToModel(this IEnumerable<BookResource> resources)
         {
-            return resources.Select(ToModel).ToList();
+            return resources?.Select(ToModel).ToList();
         }
     }
 }
diff --git a/src/Readarr.Api.V1/Books/EditionResource.cs b/src/Readarr.Api.V1/Books/EditionResource.cs
index 8e76b4130..b142e74d6 100644
--- a/src/Readarr.Api.V1/Books/EditionResource.cs
+++ b/src/Readarr.Api.V1/Books/EditionResource.cs
@@ -109,7 +109,7 @@ namespace Readarr.Api.V1.Books
 
         public static List<Edition> ToModel(this IEnumerable<EditionResource> resources)
         {
-            return resources.Select(ToModel).ToList();
+            return resources?.Select(ToModel).ToList();
         }
     }
 }