diff --git a/entrypoint.sh b/entrypoint.sh
index c0946df..195dda1 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -15,8 +15,6 @@ echo "Default toolchain: ${TOOLCHAIN}"
 if test "${ARGS[0]}" == "nightly"; then
   TOOLCHAIN="nightly"
   ARGS=("${ARGS[@]:1}")
-  echo ">>> Update nightly toolchain"
-  rustup update "${TOOLCHAIN}"
 fi
 if test "${ARGS[0]}" == "stable"; then
   TOOLCHAIN="stable" # redundant as this is the default
@@ -28,6 +26,8 @@ if [[ "${ARGS[0]}" == v1* ]]; then
 fi
 echo "Selected toolchain: ${TOOLCHAIN}"
 
+echo ">>> Update toolchain"
+rustup update "${TOOLCHAIN}"
 echo ">>> Install rustfmt and clippy"
 rustup component add --toolchain "${TOOLCHAIN}" rustfmt clippy