Can I apply for a new Non-B visa after my current one expires while I'm still in Thailand?

I have a work permit that expires mid-May and will be renewed while in Thailand. I also have my Non-B multi-entry visa that also expires in mid-May. I have just arrived in Thailand and will be here until early June. Normally, I've gotten a new non-B visa in my home country every year with the fresh renewed work permit, before the old visa expires. Is there any issue not applying for my new yearly Visa until I return home in June after the expiration of the enter-by date of the previous visa? I believe for work permits, you need to renew before the expiration date, but is there a similar rule for Non-B visas that are being approved based on the work permit?