diff --git a/src/main.rs b/src/main.rs
index e05a597e..58328d22 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -355,7 +355,7 @@ For more information about this issue see https://askubuntu.com/questions/110969
     )))]
     runner.execute(Step::Atom, "apm", || generic::run_apm(run_type))?;
     runner.execute(Step::Fossil, "fossil", || generic::run_fossil(run_type))?;
-    runner.execute(Step::Rustup, "rustup", || generic::run_rustup(&base_dirs, run_type))?;
+    runner.execute(Step::Rustup, "rustup", || generic::run_rustup(&ctx))?;
     runner.execute(Step::Juliaup, "juliaup", || generic::run_juliaup(&base_dirs, run_type))?;
     runner.execute(Step::Dotnet, ".NET", || generic::run_dotnet_upgrade(&ctx))?;
     runner.execute(Step::Choosenim, "choosenim", || generic::run_choosenim(&ctx))?;
diff --git a/src/steps/generic.rs b/src/steps/generic.rs
index cb2a87f6..27895b70 100644
--- a/src/steps/generic.rs
+++ b/src/steps/generic.rs
@@ -206,16 +206,11 @@ pub fn run_apm(run_type: RunType) -> Result<()> {
         .status_checked()
 }
 
-pub fn run_rustup(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> {
+pub fn run_rustup(ctx: &ExecutionContext) -> Result<()> {
     let rustup = utils::require("rustup")?;
 
     print_separator("rustup");
-
-    if rustup.canonicalize()?.is_descendant_of(base_dirs.home_dir()) {
-        run_type.execute(&rustup).args(["self", "update"]).status_checked()?;
-    }
-
-    run_type.execute(&rustup).arg("update").status_checked()
+    ctx.run_type().execute(rustup).arg("update").status_checked()
 }
 
 pub fn run_juliaup(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> {