diff --git a/mix.exs b/mix.exs
index 5683786056..f3a93fbe9c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -308,8 +308,8 @@ defp version(version) do
     # and a series of dot separated identifiers
     pre_release =
       [git_pre_release, branch_name]
-      |> Enum.map(&String.replace(&1, identifier_filter, "-"))
       |> Enum.filter(fn string -> string && string != "" end)
+      |> Enum.map(&String.replace(&1, identifier_filter, "-"))
       |> Enum.join(".")
       |> (fn
             "" -> nil
@@ -319,8 +319,8 @@ defp version(version) do
     # Build metadata, denoted with a plus sign
     build_metadata =
       [build_name, env_name]
-      |> Enum.map(&String.replace(&1, identifier_filter, "-"))
       |> Enum.filter(fn string -> string && string != "" end)
+      |> Enum.map(&String.replace(&1, identifier_filter, "-"))
       |> Enum.join(".")
       |> (fn
             "" -> nil