diff --git a/app/Console/Commands/Admin/EmojiMoveStorageLocalToCloud.php b/app/Console/Commands/Admin/EmojiMoveStorageLocalToCloud.php
index b22159ac7..22e53a933 100644
--- a/app/Console/Commands/Admin/EmojiMoveStorageLocalToCloud.php
+++ b/app/Console/Commands/Admin/EmojiMoveStorageLocalToCloud.php
@@ -20,7 +20,7 @@ class EmojiMoveStorageLocalToCloud extends Command
      * @var string
      */
     protected $signature = 'admin:EmojiMoveStorageLocalToCloud
-        {--limit=1000 : Max emoji rows to process this run}
+        {--limit=0 : Max emoji rows to process this run (0 = no limit, process all)}
         {--dry-run : Report what would happen without copying or writing}
         {--keep-local : Do not delete local files after verifying the cloud copy}
         {--force : Skip confirmation prompts}';
@@ -76,7 +76,7 @@ class EmojiMoveStorageLocalToCloud extends Command
         $query = CustomEmoji::whereNull('uri')
             ->whereNotNull('media_path')
             ->orderByDesc('id')
-            ->limit($limit);
+            ->when($limit > 0, fn ($q) => $q->limit($limit));
 
         $bar = $this->output->createProgressBar($query->count());
         $bar->start();
diff --git a/bootstrap/app.php b/bootstrap/app.php
index cfc71ba4c..08965c52c 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -146,8 +146,8 @@ return Application::configure(basePath: dirname(__DIR__))
         if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config_cache('media.delete_local_after_cloud')) {
             // Upload any local stragglers to cloud and GC verified local copies.
             $schedule->command('admin:MediaMoveStorageLocalToCloud --force --limit=500')->hourlyAt(15);
-            // Same for local custom emoji.
-            $schedule->command('admin:EmojiMoveStorageLocalToCloud --force --limit=1000')->dailyAt('04:35');
+            // Same for local custom emoji (no limit: keep all emoji on cloud).
+            $schedule->command('admin:EmojiMoveStorageLocalToCloud --force')->dailyAt('04:35');
         }
 
         if (config('import.instagram.enabled')) {
diff --git a/database/migrations/2026_08_30_050000_migrate_local_emoji_to_cloud.php b/database/migrations/2026_08_30_050000_migrate_local_emoji_to_cloud.php
new file mode 100644
index 000000000..68be1c270
--- /dev/null
+++ b/database/migrations/2026_08_30_050000_migrate_local_emoji_to_cloud.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Artisan;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * When cloud storage is enabled, custom emoji URLs resolve to the cloud
+     * disk. Existing emoji may still only exist locally, so move them all to
+     * cloud now (in one pass) to avoid a window where their URLs 404. This is
+     * a no-op on local-only instances.
+     */
+    public function up(): void
+    {
+        if (! (bool) config_cache('pixelfed.cloud_storage')) {
+            return;
+        }
+
+        Artisan::call('admin:EmojiMoveStorageLocalToCloud', [
+            '--force' => true,
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};