diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 70cf06e02..78cb0b13f 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -24,8 +24,8 @@ class FanOutOnWriteService < BaseService
   def deliver_to_followers(status)
     Rails.logger.debug "Delivering status #{status.id} to followers"
 
-    status.account.followers.find_each do |follower|
-      next if !follower.local? || FeedManager.instance.filter?(:home, status, follower)
+    status.account.followers.where(domain: nil).find_each do |follower|
+      next if FeedManager.instance.filter?(:home, status, follower)
       FeedManager.instance.push(:home, follower, status)
     end
   end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 27238e3d8..7f13fcf6b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -13,6 +13,7 @@ Rails.application.configure do
   # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
+  config.action_controller.asset_host      = ENV['CDN_HOST']
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.