diff --git a/include/env/ti/mmc.env b/include/env/ti/mmc.env
index b8eb51c..0256a2d 100644
--- a/include/env/ti/mmc.env
+++ b/include/env/ti/mmc.env
@@ -5,7 +5,9 @@
 	${optargs}
 	root=PARTUUID=${uuid} rw
 	rootfstype=${mmcrootfstype}
+#ifndef CONFIG_BOOTSTD
 loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr
+#endif
 bootscript=echo Running bootscript from mmc${mmcdev} ...;
 	source ${loadaddr}
 bootenvfile=uEnv.txt
@@ -18,7 +20,7 @@
 envboot=if mmc dev ${mmcdev}; then
 	if mmc rescan; then
 		echo SD/MMC found on device ${mmcdev};
-		if run loadbootscript; then
+		if test -n "${loadbootscript}" && run loadbootscript; then
 			run bootscript;
 		else
 			if run loadbootenv; then