When should the TM30 form be submitted if I return to Thailand later?

This is a TM30 question ( I have browsed previous posts but can't find an answer). I left Thailand in late April but had signed a contract for a new apartment, starting 1 May. I will not return to Thailand until late July. Landlord is asking re the TM30 form. From what I have read here, I need to ( or my landlord) needs to submit the form on my return and not now (as you need an entry stamp to upload). I do have a re-entry permit. Many thanks for any clarification.