diff --git a/cdrom.c b/cdrom.c
index 635d073..f3fdfa3 100644
--- a/cdrom.c
+++ b/cdrom.c
@@ -232,6 +232,7 @@ enum return_type cdrom_prepare(void)
 				/* refill medias and medias_models;
 				   note that get_medias() leaks memory */
 				get_medias(CDROM, &medias, &medias_models);
+				remove_wait_message();
 			}
 			if ((i = try_automatic(medias, medias_models)) != -1) {
 				if (j) {
@@ -243,9 +244,6 @@ enum return_type cdrom_prepare(void)
 			}
 		}
 
-		if (j)
-			remove_wait_message();
-
 		ptr = medias;
 		while (ptr && *ptr) {
 			count++;