diff --git a/opal/mca/btl/tcp/btl_tcp_component.c b/opal/mca/btl/tcp/btl_tcp_component.c
index f3567dbe3c..a979a0f8e7 100644
--- a/opal/mca/btl/tcp/btl_tcp_component.c
+++ b/opal/mca/btl/tcp/btl_tcp_component.c
@@ -17,7 +17,7 @@
  *                         reserved.
  * Copyright (c) 2013-2015 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -443,6 +443,11 @@ static int mca_btl_tcp_component_close(void)
         OBJ_RELEASE(event);
     }
 
+    if (NULL != mca_btl_tcp_component.tcp_local) {
+        opal_proc_table_remove_value(&mca_btl_tcp_component.tcp_procs, opal_proc_local_get()->proc_name);
+        OBJ_RELEASE(mca_btl_tcp_component.tcp_local);
+    }
+
     /* release resources */
     OBJ_DESTRUCT(&mca_btl_tcp_component.tcp_procs);
     OBJ_DESTRUCT(&mca_btl_tcp_component.tcp_frag_eager);