Fix late hangup

This PR should fix https://trello.com/c/kz8leYTe