diff --git a/src/main/groovy/io/seqera/wave/service/metric/impl/MetricsServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/metric/impl/MetricsServiceImpl.groovy
index 2a8331101..f8d7f6c4d 100644
--- a/src/main/groovy/io/seqera/wave/service/metric/impl/MetricsServiceImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/metric/impl/MetricsServiceImpl.groovy
@@ -140,11 +140,6 @@ class MetricsServiceImpl implements MetricsService {
 
     protected static String extractOrgFromKey(String key) {
         Matcher matcher = orgDateKeyPattern.matcher(key)
-        if (matcher.matches()) {
-            return matcher.group(2)
-        } else {
-            return "unknown"
-        }
-
+        return matcher.matches() ? matcher.group(2) : "unknown"
     }
 }