diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index 4eca747..e3419b4 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -98,9 +98,9 @@ public class Album {
     }
 
     public void removeGenre(Genre genre) {
-        albumGenres.removeIf(ag ->
-                ag.getGenre() != null && ag.getGenre().getId().equals(genre.getId())
-        );
+        ag.getGenre() != null && 
+            ag.getGenre().getId() != null && 
+            ag.getGenre().getId().equals(genre.getId())
     }
 
     // Método conveniente para pegar só os gêneros
@@ -221,4 +221,4 @@ public class Album {
                 ", year=" + year +
                 '}';
     }
-}
\ No newline at end of file
+}