diff --git a/musikr/src/main/cpp/JVMMetadataBuilder.cpp b/musikr/src/main/cpp/JVMMetadataBuilder.cpp
index d7254e8450..17003c5a35 100644
--- a/musikr/src/main/cpp/JVMMetadataBuilder.cpp
+++ b/musikr/src/main/cpp/JVMMetadataBuilder.cpp
@@ -40,7 +40,10 @@ void JVMMetadataBuilder::setId3v1(TagLib::ID3v1::Tag &tag) {
     id3v2.add_id("TALB", tag.album());
     id3v2.add_id("TRCK", std::to_string(tag.track()));
     id3v2.add_id("TYER", std::to_string(tag.year()));
-    id3v2.add_id("TCON", std::to_string(tag.genreNumber()));
+    const int genreNumber = tag.genreNumber();
+    if (genreNumber != 255) {
+        id3v2.add_id("TCON", std::to_string(genreNumber));
+    }
 }
 
 void JVMMetadataBuilder::setId3v2(TagLib::ID3v2::Tag &tag) {