diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index 960424e6d1967c..d14ef520814481 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -126,11 +126,10 @@ - (BOOL)callDelegateWithBlock:(void (^)(id))block #ifdef DEBUG - (BOOL)callDelegateSynchronouslyWithBlock:(void (^)(id))block { - if (self.delegateIsNull) { - return NO; - } - - block(_delegate); + id strongDelegate = _delegate; + VerifyOrReturnValue(strongDelegate, NO); + + block(strongDelegate); return YES; }