diff --git a/CHANGELOG.md b/CHANGELOG.md
index e94f8266..5dc5393a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 8.2.1
+
+### Minor changes and fixes
+
+* Fix new avatars content-type.
+
 ## 8.2.0
 
 ### New features
diff --git a/prosody-modules/mod_random_vcard_peertubelivechat/mod_random_vcard_peertubelivechat.lua b/prosody-modules/mod_random_vcard_peertubelivechat/mod_random_vcard_peertubelivechat.lua
index 43aefbda..8f420072 100644
--- a/prosody-modules/mod_random_vcard_peertubelivechat/mod_random_vcard_peertubelivechat.lua
+++ b/prosody-modules/mod_random_vcard_peertubelivechat/mod_random_vcard_peertubelivechat.lua
@@ -10,8 +10,9 @@ local avatars_files = assert(module:get_option_array("peertubelivechat_random_vc
 local avatars = {};
 local function load_avatar(filename)
   local file = assert(io.open(path.join(avatars_dir, filename), "r"));
+  local filetype = filename.sub(filename, -3); -- jpg or png
   local result = {
-    type = 'image/jpg',
+    type = 'image/' .. filetype,
     content = b64(file:read("*a"))
   };
   file:close();