Ensuring sync with TEs in clients