diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index e8d3c42e7d..e6096e8f67 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -158,15 +158,12 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
 
   execute_concurently(concurrency, exceptions) do |db|
 
-    if !Discourse.skip_post_deployment_migrations?
+    if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+      SiteIconManager.ensure_optimized!
       if ENV['SKIP_SEED'] != '1'
         puts "Seeding #{db}"
         SeedFu.seed(seed_paths)
       end
-
-      if ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-        SiteIconManager.ensure_optimized!
-      end
     end
   end