diff --git a/lib/scsi/lun.c b/lib/scsi/lun.c
index 923b8be52..97fa36bd6 100644
--- a/lib/scsi/lun.c
+++ b/lib/scsi/lun.c
@@ -222,6 +222,7 @@ scsi_lun_remove(struct spdk_scsi_lun *lun)
 	}
 	spdk_bdev_close(lun->bdev_desc);
 
+	spdk_scsi_dev_delete_lun(lun->dev, lun);
 	free(lun);
 }
 
@@ -304,8 +305,6 @@ scsi_lun_hot_remove(void *remove_ctx)
 	}
 
 	lun->removed = true;
-	spdk_scsi_dev_delete_lun(lun->dev, lun);
-
 	if (lun->io_channel == NULL) {
 		_scsi_lun_hot_remove(lun);
 		return;