Fix race condition that was surfaced due to the debouncing of the

Fix race condition that was surfaced due to the debouncing of the #2195