On finish, clean _handler and _call independently

1 files changed, 5 insertions, 6 deletions

diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index 2f727e62be..af14193581 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -184,6 +184,11 @@ const char *kCFStreamVarName = "grpc_cfstream";
     }
         completionHandler:^(NSError *errorOrNil) {
           dispatch_async(self->_dispatchQueue, ^{
+            if (self->_call) {
+              [self->_pipe writesFinishedWithError:nil];
+              self->_call = nil;
+              self->_pipe = nil;
+            }
             if (self->_handler) {
               if (!self->_initialMetadataPublished) {
                 self->_initialMetadataPublished = YES;
@@ -193,12 +198,6 @@ const char *kCFStreamVarName = "grpc_cfstream";
 
               // Clean up _handler so that no more responses are reported to the handler.
               self->_handler = nil;
-
-              if (self->_call) {
-                [self->_pipe writesFinishedWithError:nil];
-                self->_call = nil;
-                self->_pipe = nil;
-              }
             }
           });
         }];