diff --git a/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java b/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java
index 342854c4a..693a60eaf 100644
--- a/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java
+++ b/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java
@@ -43,6 +43,9 @@ public class MimeTypeConverter implements AttributeConverter<MimeType, String> {
 
     @Override
     public MimeType convertToEntityAttribute(final String dbData) {
+        if (dbData == null) {
+            return null;
+        }
         try {
             return new MimeType(dbData);
         } catch (MimeTypeParseException ex) {