diff --git a/maestro/ofi.c b/maestro/ofi.c
index 72a1572df8ded128f7f66375d169c9eb9b56f951..a74364a3344f3bb0382934a0e16e4eb08b5fd917 100644
--- a/maestro/ofi.c
+++ b/maestro/ofi.c
@@ -2110,6 +2110,13 @@ mstro_ofi__select_endpoint(struct mstro_endpoint_descriptor_ *remote,
             stat = MSTRO_FAIL;
             goto BAILOUT;
           }
+
+	  ret = pthread_mutex_unlock(&ctx->lock);
+	  if(ret!=0) {
+	    ERR("Failed to unlock msg context lock: %d (%s)\n", ret, strerror(ret));
+	    stat = MSTRO_FAIL;
+	    goto BAILOUT;
+	  }
           DEBUG("Found remote config block (%s). type %" PRIu64 ", protocol version: %d.%d.%d, workflow: %s, component: %s\n",
                 g_pm_component_descriptor.version,
                 g_pm_component_descriptor.type,