diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index e3419b4..ca4bab5 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -98,9 +98,14 @@ public class Album {
     }
 
     public void removeGenre(Genre genre) {
-        ag.getGenre() != null && 
-            ag.getGenre().getId() != null && 
-            ag.getGenre().getId().equals(genre.getId())
+        if (genre == null) {
+            return;
+        }
+        albumGenres.removeIf(ag ->
+                ag.getGenre() != null &&
+                        ag.getGenre().getId() != null &&
+                        ag.getGenre().getId().equals(genre.getId())
+        );
     }
 
     // Método conveniente para pegar só os gêneros