diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/MapAttributeConverter.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/MapAttributeConverter.java
index 68693b85c..b68b6a37d 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/MapAttributeConverter.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/MapAttributeConverter.java
@@ -29,6 +29,9 @@ public class MapAttributeConverter<JAVA_TYPE extends Enum<JAVA_TYPE>, DB_TYPE> i
 
     @Override
     public DB_TYPE convertToDatabaseColumn(final JAVA_TYPE attribute) {
+        if (attribute == null) {
+            return null;
+        }
         return javaToDbMap.get(attribute);
     }