diff --git a/db/migrate/20180718062728_create_post_reply_keys.rb b/db/migrate/20180718062728_create_post_reply_keys.rb
index 22005d22f9..a7a0860b42 100644
--- a/db/migrate/20180718062728_create_post_reply_keys.rb
+++ b/db/migrate/20180718062728_create_post_reply_keys.rb
@@ -39,7 +39,7 @@ class CreatePostReplyKeys < ActiveRecord::Migration[5.2]
         updated_at,
         created_at
       FROM email_logs
-      WHERE reply_key IS NOT NULL
+      WHERE reply_key IS NOT NULL AND post_id IS NOT NULL AND user_id IS NOT NULL
     SQL
 
     execute(sql)