diff --git a/lib/nvme/nvme_fabric.c b/lib/nvme/nvme_fabric.c
index 17c52d775..e88757098 100644
--- a/lib/nvme/nvme_fabric.c
+++ b/lib/nvme/nvme_fabric.c
@@ -1,7 +1,7 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (c) Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
- *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 /*
@@ -59,7 +59,7 @@ nvme_fabric_prop_set_cmd_sync(struct spdk_nvme_ctrlr *ctrlr,
 		return rc;
 	}
 
-	if (nvme_wait_for_completion(ctrlr->adminq, status)) {
+	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {
 		if (!status->timed_out) {
 			free(status);
 		}
@@ -145,7 +145,7 @@ nvme_fabric_prop_get_cmd_sync(struct spdk_nvme_ctrlr *ctrlr,
 		return rc;
 	}
 
-	if (nvme_wait_for_completion(ctrlr->adminq, status)) {
+	if (nvme_wait_for_completion_robust_lock(ctrlr->adminq, status, &ctrlr->ctrlr_lock)) {
 		if (!status->timed_out) {
 			free(status);
 		}
diff --git a/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c b/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
index bd78cd9d5..ec174b9d2 100644
--- a/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
+++ b/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
@@ -1,6 +1,7 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (c) Intel Corporation.
  *   All rights reserved.
+ *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
 #include "spdk/stdinc.h"
@@ -166,6 +167,17 @@ nvme_wait_for_completion(struct spdk_nvme_qpair *qpair,
 	return 0;
 }
 
+DEFINE_RETURN_MOCK(nvme_wait_for_completion_robust_lock, int);
+int
+nvme_wait_for_completion_robust_lock(struct spdk_nvme_qpair *qpair,
+				     struct nvme_completion_poll_status *status,
+				     pthread_mutex_t *robust_mutex)
+{
+	status->timed_out = false;
+	HANDLE_RETURN_MOCK(nvme_wait_for_completion_robust_lock);
+	return 0;
+}
+
 DEFINE_RETURN_MOCK(spdk_nvme_ctrlr_cmd_admin_raw, int);
 int
 spdk_nvme_ctrlr_cmd_admin_raw(struct spdk_nvme_ctrlr *ctrlr,