diff --git a/common/hwconfig.c b/common/hwconfig.c
index 43566b81bd..cac0b6348f 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -78,7 +78,7 @@ static const char *__hwconfig(const char *opt, size_t *arglen,
 
 	/* if we are passed a buffer use it, otherwise try the environment */
 	if (!env_hwconfig) {
-		if (!(gd->flags & GD_FLG_ENV_READY)) {
+		if (!(gd->flags & GD_FLG_ENV_READY) && gd->env_valid != ENV_VALID) {
 			printf("WARNING: Calling __hwconfig without a buffer "
 					"and before environment is ready\n");
 			return NULL;