diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb
index 12ed3f36397..2c72eb34221 100644
--- a/app/serializers/basic_user_serializer.rb
+++ b/app/serializers/basic_user_serializer.rb
@@ -9,7 +9,7 @@ class BasicUserSerializer < ApplicationSerializer
     if Hash === object
       User.avatar_template(user[:username], user[:uploaded_avatar_id])
     else
-      object.avatar_template
+      user.try(:avatar_template)
     end
   end
 
@@ -21,7 +21,7 @@ class BasicUserSerializer < ApplicationSerializer
     if Hash === object
       User.letter_avatar_color(user[:username])
     else
-      object.letter_avatar_color
+      user.try(:letter_avatar_color)
     end
   end