diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index bbbd60c9cb82..62a48c40dde5 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1567,8 +1567,8 @@ struct	scsi_xfer *xs;
 			return(EINVAL);
 		case	0x6:
 			if(!silent)printf("cd%d: media change\n", unit); 
-			if (cd_data[unit]->openparts)
 			cd_data[unit]->flags &= ~(CDVALID | CDHAVELABEL);
+			if (cd_data[unit]->openparts)
 			{
 				return(EIO);
 			}
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index bbbd60c9cb82..62a48c40dde5 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1567,8 +1567,8 @@ struct	scsi_xfer *xs;
 			return(EINVAL);
 		case	0x6:
 			if(!silent)printf("cd%d: media change\n", unit); 
-			if (cd_data[unit]->openparts)
 			cd_data[unit]->flags &= ~(CDVALID | CDHAVELABEL);
+			if (cd_data[unit]->openparts)
 			{
 				return(EIO);
 			}