diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index a411324624..034f265efc 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -2499,7 +2499,10 @@ class AttributeText extends AttributeString
 		switch ($this->GetFormat())
 		{
 			case 'html':
-			$sValue = HTMLSanitizer::Sanitize($sValue);
+			if (($sValue !== null) && ($sValue !== ''))
+			{
+				$sValue = HTMLSanitizer::Sanitize($sValue);
+			}
 			break;
 			
 			case 'text':