diff --git a/src/classes/repositories/class-tainacan-terms.php b/src/classes/repositories/class-tainacan-terms.php
index e5591de3b..66e9cbb53 100644
--- a/src/classes/repositories/class-tainacan-terms.php
+++ b/src/classes/repositories/class-tainacan-terms.php
@@ -181,6 +181,15 @@ class Terms extends Repository {
 
 		return new Entities\Term( $term_saved['term_id'], $term->get_taxonomy() );
 	}
+	
+	// TODO: Is this workaround ok to avoid getting htmlentities ?
+	function get_mapped_property($entity, $prop) {
+		$property = parent::get_mapped_property($entity, $prop);
+		if ($prop == 'name' || $prop == 'description') {
+			$property = wp_specialchars_decode($property);
+		}
+		return $property;
+	}
 
 	/**
 	 * fetch terms based on ID or get terms args