diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 9688f57a64b2cf0335c29bea1c56b83c169772c8..01144f5952b5c21e1690759d6fa9e35687f93b34 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -67,9 +67,14 @@ class ActivityPub::Activity
   end
 
   def distribute(status)
+    crawl_links(status)
+
+    # Only continue if the status is supposed to have
+    # arrived in real-time
+    return unless @options[:override_timestamps]
+
     notify_about_reblog(status) if reblog_of_local_account?(status)
     notify_about_mentions(status)
-    crawl_links(status)
     distribute_to_followers(status)
   end
 
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index a1ab522e23c3d9b0746bc492bc566efd61b8d2a7..3418e242054bebddcc2123544b047ce17c56c2f5 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -56,7 +56,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
     Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
 
     LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
-    DistributionWorker.perform_async(status.id)
+    DistributionWorker.perform_async(status.id) if @options[:override_timestamps]
 
     status
   end