diff --git a/dist/setup/index.js b/dist/setup/index.js
index f6f679a3..f4ff5882 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -73416,6 +73416,10 @@ function evaluateVersions(versions, versionSpec) {
     core.debug(`evaluating ${versions.length} versions`);
     core.debug(`version 1 is ${versions[0]}`);
     core.debug(`version spec is ${versionSpec}`);
+    versionSpec =
+        versionSpec.includes('nightly') && !semver.valid(versionSpec.split('-')[0])
+            ? versionSpec.split('-')[0]
+            : versionSpec;
     versions = versions.sort((a, b) => {
         if (semver.gt(a, b)) {
             return 1;
diff --git a/src/installer.ts b/src/installer.ts
index 38e98bd7..32281996 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -353,6 +353,10 @@ function evaluateVersions(versions: string[], versionSpec: string): string {
   core.debug(`evaluating ${versions.length} versions`);
   core.debug(`version 1 is ${versions[0]}`);
   core.debug(`version spec is ${versionSpec}`);
+  versionSpec =
+    versionSpec.includes('nightly') && !semver.valid(versionSpec.split('-')[0])
+      ? versionSpec.split('-')[0]
+      : versionSpec;
   versions = versions.sort((a, b) => {
     if (semver.gt(a, b)) {
       return 1;