diff --git a/include/spdk/nvme.h b/include/spdk/nvme.h
index 24ab0a79e..c0654a6bb 100644
--- a/include/spdk/nvme.h
+++ b/include/spdk/nvme.h
@@ -867,6 +867,22 @@ int spdk_nvme_detach_poll_async(struct spdk_nvme_detach_ctx *detach_ctx);
  */
 int spdk_nvme_ctrlr_set_trid(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_transport_id *trid);
 
+/**
+ * Set the remove callback and context to be invoked if the controller is removed.
+ *
+ * This will override any remove_cb and/or ctx specified when the controller was
+ * probed.
+ *
+ * This function may only be called from the primary process.  This function has
+ * no effect if called from a secondary process.
+ *
+ * \param ctrlr Opaque handle to an NVMe controller.
+ * \param remove_cb remove callback
+ * \param remove_ctx remove callback context
+ */
+void spdk_nvme_ctrlr_set_remove_cb(struct spdk_nvme_ctrlr *ctrlr,
+				   spdk_nvme_remove_cb remove_cb, void *remove_ctx);
+
 /**
  * Perform a full hardware reset of the NVMe controller.
  *
diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c
index c60294421..95dd3154f 100644
--- a/lib/nvme/nvme_ctrlr.c
+++ b/lib/nvme/nvme_ctrlr.c
@@ -1454,6 +1454,20 @@ out:
 	return rc;
 }
 
+void
+spdk_nvme_ctrlr_set_remove_cb(struct spdk_nvme_ctrlr *ctrlr,
+			      spdk_nvme_remove_cb remove_cb, void *remove_ctx)
+{
+	if (!spdk_process_is_primary()) {
+		return;
+	}
+
+	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
+	ctrlr->remove_cb = remove_ctx;
+	ctrlr->cb_ctx = remove_ctx;
+	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
+}
+
 static void
 nvme_ctrlr_identify_done(void *arg, const struct spdk_nvme_cpl *cpl)
 {
diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c
index 92710a1ce..97067bfd5 100644
--- a/lib/nvme/nvme_pcie.c
+++ b/lib/nvme/nvme_pcie.c
@@ -306,7 +306,7 @@ _nvme_pcie_hotplug_monitor(struct spdk_nvme_probe_ctx *probe_ctx)
 				/* get the user app to clean up and stop I/O */
 				if (ctrlr->remove_cb) {
 					nvme_robust_mutex_unlock(&g_spdk_nvme_driver->lock);
-					ctrlr->remove_cb(probe_ctx->cb_ctx, ctrlr);
+					ctrlr->remove_cb(ctrlr->cb_ctx, ctrlr);
 					nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);
 				}
 			}
@@ -335,7 +335,7 @@ _nvme_pcie_hotplug_monitor(struct spdk_nvme_probe_ctx *probe_ctx)
 			nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
 			if (ctrlr->remove_cb) {
 				nvme_robust_mutex_unlock(&g_spdk_nvme_driver->lock);
-				ctrlr->remove_cb(probe_ctx->cb_ctx, ctrlr);
+				ctrlr->remove_cb(ctrlr->cb_ctx, ctrlr);
 				nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);
 			}
 		}
diff --git a/lib/nvme/spdk_nvme.map b/lib/nvme/spdk_nvme.map
index de041cc2a..538d5654f 100644
--- a/lib/nvme/spdk_nvme.map
+++ b/lib/nvme/spdk_nvme.map
@@ -87,6 +87,7 @@
 	spdk_nvme_ctrlr_get_transport_id;
 	spdk_nvme_ctrlr_alloc_qid;
 	spdk_nvme_ctrlr_free_qid;
+	spdk_nvme_ctrlr_set_remove_cb;
 
 	spdk_nvme_poll_group_create;
 	spdk_nvme_poll_group_add;
diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c
index 16ae5d123..966ac354d 100644
--- a/module/bdev/nvme/bdev_nvme.c
+++ b/module/bdev/nvme/bdev_nvme.c
@@ -170,6 +170,7 @@ static int bdev_nvme_abort(struct nvme_io_channel *nvme_ch,
 			   struct nvme_bdev_io *bio, struct nvme_bdev_io *bio_to_abort);
 static int bdev_nvme_reset(struct nvme_io_channel *nvme_ch, struct nvme_bdev_io *bio);
 static int bdev_nvme_failover(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool remove);
+static void remove_cb(void *cb_ctx, struct spdk_nvme_ctrlr *ctrlr);
 
 typedef void (*populate_namespace_fn)(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
 				      struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx);
@@ -1534,6 +1535,7 @@ nvme_bdev_ctrlr_create(struct spdk_nvme_ctrlr *ctrlr,
 	}
 
 	spdk_nvme_ctrlr_register_aer_callback(ctrlr, aer_cb, nvme_bdev_ctrlr);
+	spdk_nvme_ctrlr_set_remove_cb(ctrlr, remove_cb, nvme_bdev_ctrlr);
 
 	if (spdk_nvme_ctrlr_get_flags(nvme_bdev_ctrlr->ctrlr) &
 	    SPDK_NVME_CTRLR_SECURITY_SEND_RECV_SUPPORTED) {
@@ -1625,24 +1627,18 @@ _nvme_bdev_ctrlr_destruct(void *ctx)
 static void
 remove_cb(void *cb_ctx, struct spdk_nvme_ctrlr *ctrlr)
 {
-	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;
+	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = cb_ctx;
 
 	pthread_mutex_lock(&g_bdev_nvme_mutex);
-	TAILQ_FOREACH(nvme_bdev_ctrlr, &g_nvme_bdev_ctrlrs, tailq) {
-		if (nvme_bdev_ctrlr->ctrlr == ctrlr) {
-			/* The controller's destruction was already started */
-			if (nvme_bdev_ctrlr->destruct) {
-				pthread_mutex_unlock(&g_bdev_nvme_mutex);
-				return;
-			}
-			nvme_bdev_ctrlr->destruct = true;
-			pthread_mutex_unlock(&g_bdev_nvme_mutex);
-
-			_nvme_bdev_ctrlr_destruct(nvme_bdev_ctrlr);
-			return;
-		}
+	assert(nvme_bdev_ctrlr->ctrlr == ctrlr);
+	/* The controller's destruction was already started */
+	if (nvme_bdev_ctrlr->destruct) {
+		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		return;
 	}
+	nvme_bdev_ctrlr->destruct = true;
 	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	_nvme_bdev_ctrlr_destruct(nvme_bdev_ctrlr);
 }
 
 static int
@@ -1656,8 +1652,7 @@ bdev_nvme_hotplug(void *arg)
 		spdk_nvme_trid_populate_transport(&trid_pcie, SPDK_NVME_TRANSPORT_PCIE);
 
 		g_hotplug_probe_ctx = spdk_nvme_probe_async(&trid_pcie, NULL,
-				      hotplug_probe_cb,
-				      attach_cb, remove_cb);
+				      hotplug_probe_cb, attach_cb, NULL);
 		if (!g_hotplug_probe_ctx) {
 			return SPDK_POLLER_BUSY;
 		}