diff --git a/module/bdev/daos/bdev_daos.c b/module/bdev/daos/bdev_daos.c
index d6621b8d6..0fd8b408d 100644
--- a/module/bdev/daos/bdev_daos.c
+++ b/module/bdev/daos/bdev_daos.c
@@ -808,14 +808,14 @@ exit:
 }
 
 void
-delete_bdev_daos(struct spdk_bdev *bdev, spdk_delete_daos_complete cb_fn, void *cb_arg)
+delete_bdev_daos(const char *bdev_name, spdk_bdev_unregister_cb cb_fn, void *cb_arg)
 {
-	if (!bdev || bdev->module != &daos_if) {
-		cb_fn(cb_arg, -ENODEV);
-		return;
-	}
+	int rc;
 
-	spdk_bdev_unregister(bdev, cb_fn, cb_arg);
+	rc = spdk_bdev_unregister_by_name(bdev_name, &daos_if, cb_fn, cb_arg);
+	if (rc != 0) {
+		cb_fn(cb_arg, rc);
+	}
 }
 
 static int
diff --git a/module/bdev/daos/bdev_daos.h b/module/bdev/daos/bdev_daos.h
index 2fd8d813f..c108b4bb0 100644
--- a/module/bdev/daos/bdev_daos.h
+++ b/module/bdev/daos/bdev_daos.h
@@ -8,14 +8,13 @@
 
 #include "spdk/stdinc.h"
 #include "spdk/bdev.h"
-
-typedef void (*spdk_delete_daos_complete)(void *cb_arg, int bdeverrno);
+#include "spdk/bdev_module.h"
 
 int create_bdev_daos(struct spdk_bdev **bdev, const char *name, const struct spdk_uuid *uuid,
 		     const char *pool, const char *cont, const char *oclass,
 		     uint64_t num_blocks, uint32_t block_size);
 
-void delete_bdev_daos(struct spdk_bdev *bdev, spdk_delete_daos_complete cb_fn, void *cb_arg);
+void delete_bdev_daos(const char *bdev_name, spdk_bdev_unregister_cb cb_fn, void *cb_arg);
 
 /**
  * Resize DAOS bdev.
diff --git a/module/bdev/daos/bdev_daos_rpc.c b/module/bdev/daos/bdev_daos_rpc.c
index a369230e1..71d16b6ef 100644
--- a/module/bdev/daos/bdev_daos_rpc.c
+++ b/module/bdev/daos/bdev_daos_rpc.c
@@ -121,7 +121,6 @@ rpc_bdev_daos_delete(struct spdk_jsonrpc_request *request,
 		     const struct spdk_json_val *params)
 {
 	struct rpc_delete_daos req = {NULL};
-	struct spdk_bdev *bdev;
 
 	if (spdk_json_decode_object(params, rpc_delete_daos_decoders,
 				    SPDK_COUNTOF(rpc_delete_daos_decoders),
@@ -132,14 +131,7 @@ rpc_bdev_daos_delete(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	bdev = spdk_bdev_get_by_name(req.name);
-	if (bdev == NULL) {
-		SPDK_INFOLOG(bdev_daos, "bdev '%s' does not exist\n", req.name);
-		spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
-		goto cleanup;
-	}
-
-	delete_bdev_daos(bdev, rpc_bdev_daos_delete_cb, request);
+	delete_bdev_daos(req.name, rpc_bdev_daos_delete_cb, request);
 
 cleanup:
 	free_rpc_delete_daos(&req);