diff --git a/settings/js/personal.js b/settings/js/personal.js
index b0bfa8eb230..3b2316d0614 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -83,7 +83,10 @@ function changeDisplayName () {
 				$('#oldDisplayName').val($('#displayName').val());
 				// update displayName on the top right expand button
 				$('#expandDisplayName').text($('#displayName').val());
-				updateAvatar();
+				// update avatar if avatar is available
+				if(!$('#removeavatar').hasClass('hidden')) {
+					updateAvatar();
+				}
 			}
 			else {
 				$('#newdisplayname').val(data.data.displayName);