diff --git a/internal/core/basis.go b/internal/core/basis.go
index 556c096a9..7d9dda378 100644
--- a/internal/core/basis.go
+++ b/internal/core/basis.go
@@ -375,6 +375,11 @@ func (b *Basis) Components(ctx context.Context) ([]*Component, error) {
 }
 
 func (b *Basis) component(ctx context.Context, typ component.Type, name string) (*Component, error) {
+	// If this is a command type component, the plugin is registered
+	// as only the root command
+	if typ == component.CommandType {
+		name = strings.Split(name, " ")[0]
+	}
 	return componentCreatorMap[typ].Create(ctx, b, name)
 }