diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index bd9706fc42..d79ca2256e 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -188,7 +188,7 @@ class ActivityPub::TagManager
 
   def searchable_by(status)
     searchable_by =
-      case status.compute_searchability
+      case status.compute_searchability_activitypub
       when 'public'
         [COLLECTIONS[:public]]
       when 'unlisted'  # Followers only in kmyblue (generics: private)
diff --git a/app/models/status.rb b/app/models/status.rb
index abf31c2dcf..419e6dd48b 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -383,6 +383,11 @@ class Status < ApplicationRecord
     'private'
   end
 
+  def compute_searchability_activitypub
+    return 'unlisted' if public_unlisted_visibility? && public_searchability?
+    compute_searchability
+  end
+
   after_create_commit  :increment_counter_caches
   after_destroy_commit :decrement_counter_caches