diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index f571f3a090..476b45dd5e 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -4,7 +4,7 @@
 		<div class="ui grid">
 			<div class="ui five wide column">
 				<div class="ui card">
-					{{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}}
+					{{if and (or .Owner.UseCustomAvatar .DisableGravatar) (eq .SignedUserName .Owner.Name)}}
 						<a class="image poping up" href="{{AppSubUrl}}/user/settings" id="profile-avatar" data-content="{{.i18n.Tr "user.change_custom_avatar"}}" data-variation="inverted tiny" data-position="bottom center">
 							<img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/>
 						</a>