diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 2c26af3d4ba89aa06ea5a2434d65a6a66d923923..5d7aa45f2e042f86fa3b8a0d32c781c40d9f4ce4 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -309,6 +309,7 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
 		tt->exit(targetdata);
 err_init:
 	blk_cleanup_queue(tqueue);
+	tdisk->queue = NULL;
 err_disk:
 	put_disk(tdisk);
 err_dev: