diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 9404168c2b..5a7724fba4 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -92,7 +92,7 @@ class PostStatusService < BaseService
   end
 
   def load_circle
-    return unless @options[:visibility] == 'circle'
+    return unless @options[:visibility] == 'circle' || (@options[:visibility] == 'limited' && @options[:circle_id].present?)
 
     @circle = @options[:circle_id].present? && Circle.find(@options[:circle_id])
     raise ArgumentError if @circle.nil? || @circle.account_id != @account.id