diff --git a/static/js/directives/ui/entity-search.js b/static/js/directives/ui/entity-search.js
index eb6453d71..336a9a7dc 100644
--- a/static/js/directives/ui/entity-search.js
+++ b/static/js/directives/ui/entity-search.js
@@ -286,7 +286,8 @@ angular.module('quay').directive('entitySearch', function () {
             },
             'suggestion': function (datum) {
               template = '<div class="entity-mini-listing">';
-              if ((datum.entity.kind == 'user' && !datum.entity.is_robot) || (datum.entity.kind == 'org')) {
+              if (Config['AVATAR_KIND'] === 'gravatar' &&
+                 ((datum.entity.kind == 'user' && !datum.entity.is_robot) || (datum.entity.kind == 'org'))) {
                 template += '<i class="fa"><img class="avatar-image" src="' +
                             AvatarService.getAvatar(datum.entity.avatar.hash, 20, 'mm') +
                             '"></i>';