diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c9c5dba94..d48e94a2f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -171,7 +171,7 @@ module ApplicationHelper
           user_avatar_popover_absolute_url: user_avatar_absolute_url(
             user,
             :thumb,
-            base64_encoded_imgs
+            base64_encoded_imgs && user.avatar.attached?
           )
         },
         formats: :html
diff --git a/app/views/shared/_atwho_user_container.html.erb b/app/views/shared/_atwho_user_container.html.erb
index b9c06e657..ac4a60d8c 100644
--- a/app/views/shared/_atwho_user_container.html.erb
+++ b/app/views/shared/_atwho_user_container.html.erb
@@ -21,11 +21,11 @@
     data-full-name="<%= user.full_name %>"
     data-email="<%= user.email %>"
     data-popover-html="<%= popover_html %>"
-    data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, user.avatar.attached?) %>"
+    data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
   >
     <%= user.full_name %>
   </a>
   <% unless skip_user_status || user_still_in_team %>
     <%= I18n.t('atwho.res.removed') %>
   <% end %>
-</span>
\ No newline at end of file
+</span>