Hi @ryancey - thanks for the extra info via PM. I’ve now improved the behaviour so it should work better for this situation:
https://github.com/discourse/discourse/commit/1299c94a5282693e57661f156b4072e3c890d7cc
Please give it a try and let us know if it works.