diff --git a/app/models/status.rb b/app/models/status.rb
index c8e01d776a..10a1b59a1c 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -492,8 +492,9 @@ class Status < ApplicationRecord
 
   def set_locality
     if account.domain.nil? && !attribute_changed?(:local_only)
-      self.local_only = marked_local_only?
+      self.local_only = true if marked_local_only?
     end
+    self.local_only = true if thread&.local_only? && self.local_only.nil?
     self.local_only = reblog.local_only if reblog?
   end