diff --git a/src/service/AvatarService.js b/src/service/AvatarService.js
index 5045110607..99d2c05359 100644
--- a/src/service/AvatarService.js
+++ b/src/service/AvatarService.js
@@ -17,22 +17,18 @@ export const fetchAvatarUrl = (email) => {
 	})
 
 	return Axios.get(url, { adapter: 'fetch', fetchOptions: { priority: 'low' } })
-		.then((resp) => resp.data)
-		.then((avatar) => {
-			if (avatar.isExternal) {
+		.then(res => {
+			if (res.status === 204) {
+				return undefined
+			}
+
+			if (res.data.isExternal) {
 				return generateUrl('/apps/mail/api/avatars/image/{email}', {
 					email,
 				})
-			} else {
-				return avatar.url
-			}
-		})
-		.catch((err) => {
-			if (err.response.status === 404) {
-				return undefined
 			}
 
-			return Promise.reject(err)
+			return res.data.url
 		})
 }