Handle unset resolved_at