diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c
index d5818fc77..744771b1d 100644
--- a/module/bdev/nvme/bdev_nvme.c
+++ b/module/bdev/nvme/bdev_nvme.c
@@ -441,14 +441,6 @@ nvme_ctrlr_delete(struct nvme_ctrlr *nvme_ctrlr)
 
 	free(nvme_ctrlr->namespaces);
 	free(nvme_ctrlr);
-}
-
-static void
-nvme_ctrlr_unregister_cb(void *io_device)
-{
-	struct nvme_ctrlr *nvme_ctrlr = io_device;
-
-	nvme_ctrlr_delete(nvme_ctrlr);
 
 	pthread_mutex_lock(&g_bdev_nvme_mutex);
 	if (g_bdev_nvme_module_finish && TAILQ_EMPTY(&g_nvme_bdev_ctrlrs)) {
@@ -457,10 +449,17 @@ nvme_ctrlr_unregister_cb(void *io_device)
 		spdk_bdev_module_fini_done();
 		return;
 	}
-
 	pthread_mutex_unlock(&g_bdev_nvme_mutex);
 }
 
+static void
+nvme_ctrlr_unregister_cb(void *io_device)
+{
+	struct nvme_ctrlr *nvme_ctrlr = io_device;
+
+	nvme_ctrlr_delete(nvme_ctrlr);
+}
+
 static void
 nvme_ctrlr_unregister(void *ctx)
 {