diff --git a/core/src/main/java/io/kestra/core/docs/PluginDocumentation.java b/core/src/main/java/io/kestra/core/docs/PluginDocumentation.java
index f70bef10e73..bf00cc36eeb 100644
--- a/core/src/main/java/io/kestra/core/docs/PluginDocumentation.java
+++ b/core/src/main/java/io/kestra/core/docs/PluginDocumentation.java
@@ -40,7 +40,7 @@ private PluginDocumentation(RegisteredPlugin plugin) {
                         .type(entry.getKey());
                     if (cls.getPackageName().startsWith(this.group)) {
                         var pluginSubGroup = cls.getPackage().getDeclaredAnnotation(PluginSubGroup.class);
-                        var subGroupName =  cls.getPackageName().substring(cls.getPackageName().lastIndexOf('.') + 1);
+                        var subGroupName =  cls.getPackageName().substring(this.group.length() + 1);
                         var subGroupTitle = pluginSubGroup != null ? pluginSubGroup.title() : subGroupName;
                         var subGroupDescription = pluginSubGroup != null ? pluginSubGroup.description() : null;
                         // hack to avoid adding the subgroup in the task URL when it's the group to keep search engine indexes
@@ -49,7 +49,7 @@ private PluginDocumentation(RegisteredPlugin plugin) {
                         builder.subgroup(subgroup);
                     } else {
                         // should never occur
-                        builder.subgroup(new SubGroup(this.group.substring(this.group.lastIndexOf('.') + 1)));
+                        builder.subgroup(new SubGroup(""));
                     }
 
                     return builder.build();