diff --git a/e107_handlers/e_customfields_class.php b/e107_handlers/e_customfields_class.php
index e55aed181..3dac5a14c 100644
--- a/e107_handlers/e_customfields_class.php
+++ b/e107_handlers/e_customfields_class.php
@@ -235,7 +235,7 @@
 
 				case 'textarea':
 				case 'bbarea':
-					$ret = $tp->toHTML($value, true, 'BODY');
+					$ret = ($raw) ? $value : $tp->toHTML($value, true, 'BODY');
 					break;
 
 
@@ -266,7 +266,7 @@
 					break;
 
 				default:
-					$ret = $tp->toHTML($value);
+					$ret = ($raw) ? $value : $tp->toHTML($value);
 			}