diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 05b7ce921a..be6f066fd3 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -344,10 +344,9 @@ def index
   end
 
   def unreviewed
-    @comments = @commentable.find_all_comments
-      .unreviewed_only
-      .for_display
-      .page(params[:page])
+    @comments = @commentable.find_all_comments.unreviewed_only
+    @comments = @comments.not_spam unless logged_in_as_admin?
+    @comments = @comments.for_display.page(params[:page])
   end
 
   # GET /comments/1
diff --git a/app/models/comment.rb b/app/models/comment.rb
index a46daf221c..91d15a1358 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -91,6 +91,7 @@ def edited_spam
   scope :top_level,       -> { where.not(commentable_type: "Comment") }
   scope :include_pseud,   -> { includes(:pseud) }
   scope :not_deleted,     -> { where(is_deleted: false) }
+  scope :not_spam,        -> { where(approved: true) }
   scope :reviewed,        -> { where(unreviewed: false) }
   scope :unreviewed_only, -> { where(unreviewed: true) }
 
diff --git a/app/views/works/_work_header_navigation.html.erb b/app/views/works/_work_header_navigation.html.erb
index 363a6078dd..0e74060158 100644
--- a/app/views/works/_work_header_navigation.html.erb
+++ b/app/views/works/_work_header_navigation.html.erb
@@ -12,7 +12,7 @@
   <% end %>
 
 
-  <% # chapter navigation %>
+  <%# chapter navigation %>
   <% if @previous_chapter || @next_chapter %>
     <li class="chapter entire"><%= link_to ts("Entire Work"), work_path(@work, :view_full_work => 'true') %></li>
 
@@ -44,7 +44,7 @@
   <% end %>
 
 
-  <% # for users, bookmark and mark to read later %>
+  <%# for users, bookmark and mark to read later %>
   <% if current_user.is_a?(User) %>
     <% @bookmark ||= bookmark_if_exists(@work) %>
     <li class="bookmark">
@@ -64,7 +64,7 @@
   <% end %>
 
   <li class="comments" id="show_comments_link_top">
-    <% # If in single chapter view, show comments for the chapter; otherwise, show the comments for the entire work %>
+    <%# If in single chapter view, show comments for the chapter; otherwise, show the comments for the entire work %>
     <% @previous_chapter || @next_chapter ? commentable = @chapter : commentable = @work %>
     <% if commentable.count_visible_comments > 0 %>
       <%= show_hide_comments_link(commentable) %>
@@ -73,14 +73,19 @@
     <% end %>
   </li>
 
-  <% # for author or admin, review comments if moderating them %>
+  <%# for author or admin, review comments if moderating them %>
   <% if (logged_in_as_admin? || (current_user && current_user.is_author_of?(@work))) && @work.find_all_comments.unreviewed_only.exists? %>
     <li class="comments" id="review_comments">
-      <%= link_to ts("Unreviewed Comments") + " (" + @work.find_all_comments.unreviewed_only.count.to_s + ")" , unreviewed_work_comments_path(@work) %>
+      <% unreviewed_count = if logged_in_as_admin?
+                              @work.find_all_comments.unreviewed_only.count
+                            else
+                              @work.find_all_comments.unreviewed_only.not_spam.count
+                            end %>
+      <%= link_to t("works.work_header_navigation.unreviewed_comments", count: unreviewed_count), unreviewed_work_comments_path(@work) %>
     </li>
   <% end %>
 
-  <% # allow user to disable style on work if it has been customized %>
+  <%# allow user to disable style on work if it has been customized %>
   <% if @work.work_skin %>
     <li class="style">
       <% if Preference.disable_work_skin?(params[:style]) %>
@@ -105,7 +110,7 @@
     </li>
   <% end %>
 
-  <%# The li, noscript, and button tags MUST be on the same line here to avoid the behavior described in https://otwarchive.atlassian.net/browse/AO3-4629?focusedCommentId=372231 %>
+  <%# The li, noscript, and button tags MUST be on the same line here %>
   <% if downloadable? && AdminSetting.current.downloads_enabled? %>
     <li class="download"><noscript><h4 class="heading"><%= t(".download.heading") %></h4></noscript><button class="hidden"><%= t(".download.button") %></button>
       <ul class="expandable secondary">
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 630a3291f9..792e2db918 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -3346,6 +3346,7 @@ en:
       download:
         button: Download
         heading: Download
+      unreviewed_comments: "Unreviewed Comments (%{count})"
     work_header_notes:
       inspired_by:
         other_works_inspired_by_this_one: other works inspired by this one
diff --git a/features/comments_and_kudos/comment_moderation.feature b/features/comments_and_kudos/comment_moderation.feature
index 3f32b97d08..c5837b85b8 100644
--- a/features/comments_and_kudos/comment_moderation.feature
+++ b/features/comments_and_kudos/comment_moderation.feature
@@ -330,3 +330,23 @@ Feature: Comment Moderation
       And I view the work "Moderation"
       And I follow "Unreviewed Comments (1)"
     Then I should not see "Parent Thread"
+
+  Scenario: Creator marks an unreviewed comment as spam and the count updates
+    Given I am logged in as "spam_catcher"
+    And I have a work "Spam Trap"
+    And I edit the work "Spam Trap"
+    And I check "Enable comment moderation on this work"
+    And I press "Post Without Preview"
+    And I am logged out
+    When I view the work "Spam Trap"
+    And I fill in "Comment" with "Fake spam"
+    And I fill in "Name" with "Spammer"
+    And I fill in "Email" with "spam@example.com"
+    And I press "Comment"
+    When I am logged in as "spam_catcher"
+    And I view the work "Spam Trap"
+    Then I should see "Unreviewed Comments (1)"
+    When I follow "Unreviewed Comments"
+    And I follow "Spam"
+    Then I should see "Unreviewed Comments (0)"
+    And I should not see "Fake spam"
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index 22d1cc413a..2881865066 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -273,6 +273,7 @@
 
 Given "the moderated work {string} by {string}" do |title, login|
   user = ensure_user(login)
+  user.preference.update!(allow_co_creator_invite: true)
   w = FactoryBot.create(:work, title: title, authors: [user.default_pseud])
   w.update_attribute(:moderated_commenting_enabled, true)
 end