diff --git a/convention/src/main/kotlin/jf.autoversion.gradle.kts b/convention/src/main/kotlin/jf.autoversion.gradle.kts
index 88d9de1..42220b0 100644
--- a/convention/src/main/kotlin/jf.autoversion.gradle.kts
+++ b/convention/src/main/kotlin/jf.autoversion.gradle.kts
@@ -7,7 +7,7 @@ val isRelease = project.hasProperty("release")
 val specialCaseBuilds = setOf("forge", "fabric", "neoforge")
 fun List<Tag>.filter(): Pair<Tag, Tag?>? {
     if (isEmpty()) return null
-    val envName = System.getenv("CI_COMMIT_TAG")
+    val envName = System.getenv("CI_COMMIT_TAG")?.ifEmpty { null }
     val current = envName?.let { v -> indexOfFirst { it.name == v } } ?: 0
     if (current == -1) throw IllegalStateException("Current tag ($envName) not found in tag list")
     if (size == current) return get(current) to null