diff --git a/src/rustup-dist/src/dist.rs b/src/rustup-dist/src/dist.rs
index b7fde7d4ef..cf3f8e7d2a 100644
--- a/src/rustup-dist/src/dist.rs
+++ b/src/rustup-dist/src/dist.rs
@@ -374,7 +374,8 @@ impl ToolchainDesc {
     }
 
     pub fn is_tracking(&self) -> bool {
-        self.date.is_none()
+        let channels = ["nightly", "beta", "stable"];
+        channels.iter().any(|x| *x == self.channel) && self.date.is_none()
     }
 }