diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 31b774f4238..93f149ed519 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -8,7 +8,7 @@ task 'posts:rebake' => :environment do
 end
 
 task 'posts:rebake_uncooked_posts' => :environment do
-  uncooked = Post.where(baked_version: nil)
+  uncooked = Post.where('baked_version <> ? or baked_version IS NULL', Post::BAKED_VERSION)
 
   rebaked = 0
   total = uncooked.count
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 8a819d4b393..5186480a449 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -243,7 +243,7 @@ def migration_successful?(db, should_raise = false)
   raise "rake posts:missing_uploads identified #{count} issues. #{failure_message}" if count > 0 && should_raise
   success &&= count == 0
 
-  count = Post.where('baked_version <> ?', Post::BAKED_VERSION).count
+  count = Post.where('baked_version <> ? OR baked_version IS NULL', Post::BAKED_VERSION).count
   if count > 0
     puts "No posts require rebaking"
   else
@@ -498,7 +498,7 @@ def migrate_to_s3
 
       puts "Flagging all posts containing oneboxes for rebake..."
 
-      count = Post.where("cooked LIKE '%class=\"lightbox\"%'").update_all(baked_version: Post::BAKED_VERSION - 1)
+      count = Post.where("cooked LIKE '%class=\"lightbox\"%'").update_all(baked_version: nil)
       puts "#{count} posts were flagged for a rebake"
     end
   end