diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index d55621f..4eca747 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -74,7 +74,9 @@ public class Album {
 
     public void removeArtist(Artist artist) {
         albumArtists.removeIf(aa ->
-                aa.getArtist() != null && aa.getArtist().getId().equals(artist.getId())
+                aa.getArtist() != null && 
+                aa.getArtist().getId() != null && 
+                aa.getArtist().getId().equals(artist.getId())
         );
     }