diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index d373480..cdb050c 100644
--- a/common/cmd_fdc.c
+++ b/common/cmd_fdc.c
@@ -721,6 +721,7 @@
 	image_header_t *hdr;  /* used for fdc boot */
 	unsigned char boot_drive;
 	int i,nrofblk;
+	char *ep;
 	int rcode = 0;
 #if defined(CONFIG_FIT)
 	const void *fit_hdr = NULL;
@@ -823,7 +824,7 @@
 	load_addr = addr;
 
 	/* Check if we should attempt an auto-start */
-	if (getenv_yesno("autostart")) {
+	if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
 		char *local_args[2];
 
 		local_args[0] = argv[0];