diff --git a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/commands/BranchUtil.java b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/commands/BranchUtil.java
index 18a3947201..5dd0dbab1e 100644
--- a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/commands/BranchUtil.java
+++ b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/commands/BranchUtil.java
@@ -41,7 +41,7 @@ public static void deleteUnfilteredBranches(final Repository repository,
                 .call()
                 .stream()
                 .map(Ref::getName)
-                .map(fullname -> fullname.substring(fullname.lastIndexOf('/') + 1))
+                .map(fullname -> fullname.replaceFirst("^refs/heads/", ""))
                 .filter(name -> !branchesToKeep.contains(name))
                 .toArray(String[]::new);
         git.branchDelete()