diff --git a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java
index 537fb47..ba3ab4f 100644
--- a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java
+++ b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java
@@ -27,7 +27,7 @@ public class DefaultDateParameterMapMapper implements ParameterMapMapper<Date> {
 		if (value instanceof Date) {
 			return (Date) value;
 		}
-		if (value instanceof String) {
+		if (value instanceof String && ((String) value).trim().length() == 0) {
 			try {
 				return DateUtil.DEFAULT_DATEFORMAT.parse((String) value);
 			} catch (ParseException e) {