diff --git a/env/env.c b/env/env.c
index e4dfb92..7168cb9 100644
--- a/env/env.c
+++ b/env/env.c
@@ -322,17 +322,18 @@
 
 		debug("%s: Environment %s init done (ret=%d)\n", __func__,
 		      drv->name, ret);
-
-		if (gd->env_valid == ENV_INVALID)
-			ret = -ENOENT;
 	}
 
+	if (!prio) {
+		gd->env_addr = (ulong)&default_environment[0];
+		gd->env_valid = ENV_INVALID;
+
-	if (!prio)
-		return -ENODEV;
+		return 0;
+	}
 
 	if (ret == -ENOENT) {
 		gd->env_addr = (ulong)&default_environment[0];
-		gd->env_valid = ENV_VALID;
+		gd->env_valid = ENV_INVALID;
 
 		return 0;
 	}