diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 65b644902c729..742b63ccf599c 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -638,7 +638,9 @@ ActivityPtr MakeActivity(Factory promise_factory, } inline Pending IntraActivityWaiter::pending() { - wakeups_ |= GetContext()->CurrentParticipant(); + if (Activity::current()) { + wakeups_ |= GetContext()->CurrentParticipant(); + } return Pending(); }