diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index 684bc6c..f2d7765 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -98,6 +98,9 @@ public class Album {
     }
 
     public void removeGenre(Genre genre) {
+        if (genre != null) {
+            return;
+        }
         albumGenres.removeIf(ag ->
                 ag.getGenre() != null &&
                         ag.getGenre().getId() != null &&