diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 73f480494ab..2ab95178081 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -28,7 +28,7 @@ module Jobs
       TopicTimer.ensure_consistency!
 
       # Forces rebake of old posts where needed, as long as no system avatars need updating
-      unless UserAvatar.where("last_gravatar_download_attempt IS NULL").limit(1).first
+      if !SiteSetting.automatically_download_gravatars || !UserAvatar.where("last_gravatar_download_attempt IS NULL").limit(1).first
         problems = Post.rebake_old(SiteSetting.rebake_old_posts_count)
         problems.each do |hash|
           post_id = hash[:post].id