diff --git a/tools/performance-server/ui/src/main/kotlin/main.kt b/tools/performance-server/ui/src/main/kotlin/main.kt
index 476ad66b7a0..83ecc074b1c 100644
--- a/tools/performance-server/ui/src/main/kotlin/main.kt
+++ b/tools/performance-server/ui/src/main/kotlin/main.kt
@@ -224,7 +224,7 @@ fun main(args: Array<String>) {
         error("Response is expected to be an array.")
     }
     val builds = data.jsonArray.map { Build.create(it as JsonObject) }
-            .sortedWith(compareBy ( { it.buildNumber.substringBefore("-").toDouble() }, { it.buildNumber.substringAfterLast("-").toInt() }))
+            .sortedWith(compareBy ( { it.buildNumber.substringBefore(".").toInt() }, { it.buildNumber.substringAfter(".").substringBefore("-").toDouble() }, { it.buildNumber.substringAfterLast("-").toInt() }))
 
     val branchesUrl = "$serverUrl/branches/${parameters["target"]}"