diff --git a/application/Espo/ORM/BaseEntity.php b/application/Espo/ORM/BaseEntity.php
index 44230d80d3..5df79c2139 100644
--- a/application/Espo/ORM/BaseEntity.php
+++ b/application/Espo/ORM/BaseEntity.php
@@ -500,8 +500,8 @@ class BaseEntity implements Entity
 
         switch ($attributeType) {
             case self::VARCHAR:
-                // @todo Convert to string if not null in v9.0.
-                return $value;
+            case self::TEXT:
+                return strval($value);
 
             case self::BOOL:
                 return ($value === 1 || $value === '1' || $value === true || $value === 'true');