diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 03a03763457c..757619878068 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1342,6 +1342,12 @@ static int set_machine_constraints(struct regulator_dev *rdev,
 			rdev_err(rdev, "failed to set initial mode: %d\n", ret);
 			return ret;
 		}
+	} else if (rdev->constraints->system_load) {
+		/*
+		 * We'll only apply the initial system load if an
+		 * initial mode wasn't specified.
+		 */
+		drms_uA_update(rdev);
 	}
 
 	/* If the constraints say the regulator should be on at this point