diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index d3100823c9..5a99b79295 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -129,7 +129,7 @@ class PostStatusService < BaseService
   end
 
   def searchability
-    return :private if @options[:searchability]&.to_sym == :public && @visibility&.to_sym == :unlisted && @account.user&.setting_disallow_unlisted_public_searchability
+    return :private if %i(public public_unlisted).include?(@options[:searchability]&.to_sym) && @visibility&.to_sym == :unlisted && @account.user&.setting_disallow_unlisted_public_searchability
 
     case @options[:searchability]&.to_sym
     when :public
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 77a7f4b41e..0356cc9d89 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -246,7 +246,7 @@ en:
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a post
         setting_disable_swiping: Disable swiping motions
-        setting_disallow_unlisted_public_searchability: Disallow everyone searchability when unlisted visibility
+        setting_disallow_unlisted_public_searchability: Disallow everyone or local searchability when unlisted visibility
         setting_display_media: Media display
         setting_display_media_default: Default
         setting_display_media_expand: Show more medias
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 58e702ef30..c5ff387be5 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -255,7 +255,7 @@ ja:
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: 投稿を削除する前に確認ダイアログを表示する
         setting_disable_swiping: スワイプでの切り替えを無効にする
-        setting_disallow_unlisted_public_searchability: 未収載投稿の検索許可が「誰でも」だった場合、「フォロワーのみ」に変更する
+        setting_disallow_unlisted_public_searchability: 非収載投稿の検索許可が「誰でも」「ローカルとフォロワー」だった場合、「フォロワーのみ」に変更する
         setting_display_media: メディアの表示
         setting_display_media_default: 標準
         setting_display_media_expand: 5個目以降のメディアも表示する (最大16)