diff --git a/db/post_migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb b/db/post_migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb
new file mode 100644
index 00000000000..950794b7456
--- /dev/null
+++ b/db/post_migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class ResetCustomEmojiPostBakesVersionSecureFix < ActiveRecord::Migration[6.1]
+  def up
+    if SiteSetting.secure_media
+      execute <<~SQL
+        UPDATE posts SET baked_version = 0
+        WHERE cooked LIKE '%emoji emoji-custom%' AND cooked LIKE '%secure-media-uploads%'
+      SQL
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end