What should I expect when leaving Thailand after working without a permit and what are my chances of re-entering as a tourist?

Hi all! I'd be grateful for some urgent advice 🙌

I'll try to keep this as clear as possible:

November 2025: accepted a job as a teacher at a school in Thailand with a start date of January 2026.

December 2025: applied for and received a Thai Non-B 90 day visa by the Embassy in London.

January 2026:

- entered Thailand on Jan 1st and had the non-B visa stamped in my passport (valid for 90 days).

- started the job on January 5th. Was told by my employer that they were in the process of applying for my work permit.

- by my second week working there I had realised the job was completely not as described, management were verbally abusing me, and still no work permit (they then told me that they would wait until my probation was finished to apply for the work permit. Probation was 2 months. I knew this was illegal).

- I quit at the end of my third week there due to the lack of work permit, the not as described job, and the horrendous abuse. My resignation (with immediate effect) was followed by a week of abusive emails from management and them refusing to pay me for the time I had worked.

February 2026:

- they eventually paid me and the abuse/all contact stopped.

- I called immigration 5 times and was told each time that I was allowed to stay in Thailand until my 90 day non-B visa expired. They said it didn't matter that I wasn't working - I was still allowed to stay until the visa date in my passport.

March 2026:

I'm now a few days away from the Non-B visa expiring. I have a flight out of Thailand tomorrow. I'm very worried about the following:

1. I worked for 3 weeks without a work permit. Will I get in trouble for this tomorrow when I'm at the airport?

OR

2. My former employer did secretly have a work permit for me (without my knowledge) and I've therefore over stayed by around 60 days because I didn't leave when they cancelled it when I quit. Surely they couldn't have obtained a permit for me though without me knowing?!

Also, I plan to re-enter Thailand as a tourist 4 days after my non-B expires. I will stay for 2 weeks and then leave for good. Will I have difficulties trying to enter Thailand so soon after non-B expiring?

🙃

Would massively appreciate any help! Thank you