🍒 [2.7] Fixes an exception from being thrown on async events (#5980)

🍒 [2.7] Fixes an exception from being thrown on async events (#5980) #1