diff --git a/opal/mca/btl/ofi/btl_ofi_component.c b/opal/mca/btl/ofi/btl_ofi_component.c
index 4f89132729..c7475539c9 100644
--- a/opal/mca/btl/ofi/btl_ofi_component.c
+++ b/opal/mca/btl/ofi/btl_ofi_component.c
@@ -584,6 +584,7 @@ fail:
     /* close basic ep before closing av */
     if (NULL != ep && !module->is_scalable_ep) {
         fi_close(&ep->fid);
+        ep = NULL;
     }
 
     /* if the contexts have not been initiated, num_contexts should