fix: ensure Timestamp is correct before updating entity

fix: ensure Timestamp is correct before updating entity #2303