diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index 22383b3cec6..5d19b8ead16 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -22,13 +22,7 @@ module PrettyText
       return "" unless user.present?
 
       # TODO: Add support for ES6 and call `avatar-template` directly
-      if !user.uploaded_avatar_id
-        avatar_template = User.default_template(username)
-      else
-        avatar_template = user.avatar_template
-      end
-
-      UrlHelper.schemaless UrlHelper.absolute avatar_template
+      UrlHelper.schemaless(UrlHelper.absolute(user.avatar_template))
     end
 
     def mention_lookup(name)