diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee
index 020d30f20..275807ad7 100644
--- a/server/users/user_handler.coffee
+++ b/server/users/user_handler.coffee
@@ -219,6 +219,7 @@ UserHandler = class UserHandler extends Handler
   avatar: (req, res, id) ->
     @modelClass.findById(id).exec (err, document) =>
       return @sendDatabaseError(res, err) if err
+      return @sendNotFoundError(res) unless document
       photoURL = document?.get('photoURL')
       if photoURL
         photoURL = "/file/#{photoURL}"