diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index 1f10d37d334..27d307eaedd 100644
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -616,16 +616,20 @@ pub fn to_real_manifest(
         let default_edition = Edition::default();
         let latest_edition = Edition::LATEST_STABLE;
 
-        let tip = if msrv_edition == default_edition {
-            String::new()
-        } else if msrv_edition == latest_edition {
-            format!(" while the latest is {latest_edition}")
-        } else {
-            format!(" while {msrv_edition} is compatible with `rust-version`")
-        };
-        warnings.push(format!(
-            "no edition set: defaulting to the {default_edition} edition{tip}",
-        ));
+        // We're trying to help the user who might assume they are using a new edition,
+        // so if they can't use a new edition, don't bother to tell them to set it.
+        // This also avoids having to worry about whether `package.edition` is compatible with
+        // their MSRV.
+        if msrv_edition != default_edition {
+            let tip = if msrv_edition == latest_edition {
+                format!(" while the latest is {latest_edition}")
+            } else {
+                format!(" while {msrv_edition} is compatible with `rust-version`")
+            };
+            warnings.push(format!(
+                "no edition set: defaulting to the {default_edition} edition{tip}",
+            ));
+        }
         default_edition
     };
     // Add these lines if start a new unstable edition.
diff --git a/tests/testsuite/edition.rs b/tests/testsuite/edition.rs
index 6f68233c19a..14b5e8460d1 100644
--- a/tests/testsuite/edition.rs
+++ b/tests/testsuite/edition.rs
@@ -141,7 +141,6 @@ fn unset_edition_works_with_no_newer_compatible_edition() {
     p.cargo("check -v")
         .with_stderr(
             "\
-[WARNING] no edition set: defaulting to the 2015 edition
 [CHECKING] foo [..]
 [RUNNING] `rustc [..] --edition=2015 [..]`
 [FINISHED] [..]