diff --git a/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java b/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
index 307b3f36ce..4959abce74 100644
--- a/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
+++ b/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
@@ -25,8 +25,8 @@
 @Converter(autoApply = true)
 public class TagsConverter implements AttributeConverter<Tags,String> {
     @Override
-    public String convertToDatabaseColumn(Tags attribute) {
-        return attribute.toString();
+    public String convertToDatabaseColumn(Tags tags) {
+        return tags != null && tags.size() > 0 ? tags.toString() : "";
     }
 
     @Override
@@ -34,4 +34,3 @@ public Tags convertToEntityAttribute(String dbData) {
         return new Tags(dbData);
     }
 }
-