fix: Address race condition disrupting graceful shutdown process

fix: Address race condition disrupting graceful shutdown process #8745