diff --git a/src/core/lib/transport/handshaker.cc b/src/core/lib/transport/handshaker.cc
index 295fe5259f4..f6f1a0db93d 100644
--- a/src/core/lib/transport/handshaker.cc
+++ b/src/core/lib/transport/handshaker.cc
@@ -101,11 +101,6 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error_handle error) {
             HandshakerArgsString(&args_).c_str());
   }
   GPR_ASSERT(index_ <= handshakers_.size());
-  if (args_.read_buffer != nullptr) {
-    grpc_slice_buffer_destroy(args_.read_buffer);
-    gpr_free(args_.read_buffer);
-    args_.read_buffer = nullptr;
-  }
   // If we got an error or we've been shut down or we're exiting early or
   // we've finished the last handshaker, invoke the on_handshake_done
   // callback.  Otherwise, call the next handshaker.
@@ -124,8 +119,13 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error_handle error) {
         grpc_endpoint_shutdown(args_.endpoint, error);
         grpc_endpoint_destroy(args_.endpoint);
         args_.endpoint = nullptr;
-        args_.args = ChannelArgs();
       }
+      if (args_.read_buffer != nullptr) {
+        grpc_slice_buffer_destroy(args_.read_buffer);
+        gpr_free(args_.read_buffer);
+        args_.read_buffer = nullptr;
+      }
+      args_.args = ChannelArgs();
     }
     if (GRPC_TRACE_FLAG_ENABLED(grpc_handshaker_trace)) {
       gpr_log(GPR_INFO,