diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 5897427fe27..99ec23c6a73 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1037,7 +1037,7 @@ class ExtraFields
 		}
 		if ($type == 'text')
 		{
-			$value=nl2br($value);
+			$value=dol_htmlentitiesbr($value);
 		}
 		else
 		{