diff --git a/app/components/comments/avatar_component.html.erb b/app/components/comments/avatar_component.html.erb
index dc59e90b4..a9cc6fde0 100644
--- a/app/components/comments/avatar_component.html.erb
+++ b/app/components/comments/avatar_component.html.erb
@@ -1,13 +1,3 @@
 <span class="comment-avatar">
-  <% if comment.as_administrator? %>
-    <%= special_avatar("avatar_admin.png", class: "admin-avatar") %>
-  <% elsif comment.as_moderator? %>
-    <%= special_avatar("avatar_moderator.png", class: "moderator-avatar") %>
-  <% elsif comment.user.hidden? || comment.user.erased? %>
-    <span class="icon-deleted user-deleted"></span>
-  <% elsif comment.user.organization? %>
-    <%= special_avatar("avatar_collective.png", class: "avatar") %>
-  <% else %>
-    <%= render Shared::AvatarComponent.new(comment.user, size: 32) %>
-  <% end %>
+  <%= avatar %>
 </span>
diff --git a/app/components/comments/avatar_component.rb b/app/components/comments/avatar_component.rb
index 2fd691bf7..9d1504658 100644
--- a/app/components/comments/avatar_component.rb
+++ b/app/components/comments/avatar_component.rb
@@ -7,6 +7,20 @@ class Comments::AvatarComponent < ApplicationComponent
 
   private
 
+    def avatar
+      if comment.as_administrator?
+        special_avatar("avatar_admin.png", class: "admin-avatar")
+      elsif comment.as_moderator?
+        special_avatar("avatar_moderator.png", class: "moderator-avatar")
+      elsif comment.user.hidden? || comment.user.erased?
+        tag.span(class: "icon-deleted user-deleted")
+      elsif comment.user.organization?
+        special_avatar("avatar_collective.png", class: "avatar")
+      else
+        render Shared::AvatarComponent.new(comment.user, size: 32)
+      end
+    end
+
     def special_avatar(image_name, options = {})
       image_tag(image_name, { size: 32, alt: "" }.merge(options))
     end