diff --git a/php/modules/Album.php b/php/modules/Album.php
index 3e91786..3d9642f 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -402,7 +402,7 @@ class Album extends Module {
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Parse
-		$description = htmlentities($description);
+		$description = htmlentities($description, ENT_COMPAT | ENT_HTML401, 'UTF-8');
 		if (strlen($description)>1000) $description = substr($description, 0, 1000);
 
 		# Execute query
diff --git a/php/modules/Photo.php b/php/modules/Photo.php
index ecb979e..c6afb3b 100755
--- a/php/modules/Photo.php
+++ b/php/modules/Photo.php
@@ -656,7 +656,7 @@ class Photo extends Module {
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Parse
-		$description = htmlentities($description);
+		$description = htmlentities($description, ENT_COMPAT | ENT_HTML401, 'UTF-8');
 		if (strlen($description)>1000) $description = substr($description, 0, 1000);
 
 		# Set description