diff --git a/lib/distro_defaults.cmd b/lib/distro_defaults.cmd
index 48e6004..c952c98 100644
--- a/lib/distro_defaults.cmd
+++ b/lib/distro_defaults.cmd
@@ -85,11 +85,12 @@ for i in 1 2 3 4 5 6 7 ; do
 					fi;
 					if test -n ${mmcargs}; then
 						run mmcargs;
-					fi;
-					if test -n ${set_boot_args}; then
-						run set_boot_args;
 					else
-						setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${rootfstype} rootwait fixrtc ${systemd} ${cmdline};
+						if test -n ${set_boot_args}; then
+							run set_boot_args;
+						else
+							setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${rootfstype} rootwait fixrtc ${systemd} ${cmdline};
+						fi;
 					fi;
 					echo debug: [${bootargs}] ... ;
 					echo debug: [bootz ${kernel_addr_r} ${ramdisk_addr_r}:${initrd_size} ${fdt_addr_r}] ... ;
@@ -98,11 +99,12 @@ for i in 1 2 3 4 5 6 7 ; do
 					echo Not using Linux initial RAM disk: [initrd.img-${uname_r}] ...;
 					if test -n ${mmcargs}; then
 						run mmcargs;
-					fi;
-					if test -n ${set_boot_args}; then
-						run set_boot_args;
 					else
-						setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${rootfstype} rootwait fixrtc ${systemd} ${cmdline};
+						if test -n ${set_boot_args}; then
+							run set_boot_args;
+						else
+							setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${rootfstype} rootwait fixrtc ${systemd} ${cmdline};
+						fi;
 					fi;
 					echo debug: [${bootargs}] ... ;
 					echo debug: [bootz ${kernel_addr_r} - ${fdt_addr_r}] ... ;