diff --git a/CHANGES.txt b/CHANGES.txt
index f3dfffd800f..ddf5cb3554a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -409,6 +409,7 @@ Release 0.21.0 - Unreleased
                (Karthik Ranganathan via JD)
    HBASE-2769  Fix typo in warning message for HBaseConfiguration
    HBASE-2768  Fix teardown order in TestFilter
+   HBASE-2763  Cross-port HADOOP-6833 IPC parameter leak bug
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
index c7083f632fd..2b5eeb6d244 100644
--- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
+++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
@@ -523,6 +523,7 @@ public class HBaseClient {
           //noinspection ThrowableInstanceNeverThrown
           call.setException(new RemoteException( WritableUtils.readString(in),
               WritableUtils.readString(in)));
+          calls.remove(id);
         } else {
           Writable value = ReflectionUtils.newInstance(valueClass, conf);
           value.readFields(in);                 // read value