diff --git a/app/components/comments/avatar_component.html.erb b/app/components/comments/avatar_component.html.erb
index 9dd1c08f8..0c95fa943 100644
--- a/app/components/comments/avatar_component.html.erb
+++ b/app/components/comments/avatar_component.html.erb
@@ -2,12 +2,10 @@
   <%= image_tag("avatar_admin.png", size: 32, class: "admin-avatar float-left", alt: "") %>
 <% elsif comment.as_moderator? %>
   <%= image_tag("avatar_moderator.png", size: 32, class: "moderator-avatar float-left", alt: "") %>
+<% elsif comment.user.hidden? || comment.user.erased? %>
+  <span class="icon-deleted user-deleted"></span>
+<% elsif comment.user.organization? %>
+  <%= image_tag("avatar_collective.png", size: 32, class: "avatar float-left", alt: "") %>
 <% else %>
-<% if comment.user.hidden? || comment.user.erased? %>
-    <span class="icon-deleted user-deleted"></span>
-  <% elsif comment.user.organization? %>
-    <%= image_tag("avatar_collective.png", size: 32, class: "avatar float-left", alt: "") %>
-  <% else %>
-    <%= render Shared::AvatarComponent.new(comment.user, size: 32, class: "float-left") %>
-  <% end %>
+  <%= render Shared::AvatarComponent.new(comment.user, size: 32, class: "float-left") %>
 <% end %>