diff --git a/client/v2/CHANGELOG.md b/client/v2/CHANGELOG.md
index f475f2049513..f7dea074999f 100644
--- a/client/v2/CHANGELOG.md
+++ b/client/v2/CHANGELOG.md
@@ -58,6 +58,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * [#21853](https://github.com/cosmos/cosmos-sdk/pull/21853) Fix `*big.Int` unmarshalling in txs.
+* [cosmos/gaia#3412](https://github.com/cosmos/gaia/issues/3412) Fix duplicate command addition in `autocli`
 
 ## [v2.0.0-beta.5] - 2024-09-18
 
diff --git a/client/v2/autocli/common.go b/client/v2/autocli/common.go
index 5c32f16ca32a..409198267cfd 100644
--- a/client/v2/autocli/common.go
+++ b/client/v2/autocli/common.go
@@ -140,7 +140,16 @@ func (b *Builder) enhanceCommandCommon(
 
 		// if we have a custom command use that instead of generating one
 		if custom, ok := customCmds[moduleName]; ok {
-			if hasModuleOptions { // check if we need to enhance the existing command
+			// Custom may not be called the same as its module, so we need to have a separate check here
+			if subCmd := findSubCommand(cmd, custom.Name()); subCmd != nil {
+				if hasModuleOptions { // check if we need to enhance the existing command
+					if err := enhanceCustomCmd(b, subCmd, cmdType, modOpts); err != nil {
+						return err
+					}
+				}
+				continue
+			}
+			if hasModuleOptions { // check if we need to enhance the new command
 				if err := enhanceCustomCmd(b, custom, cmdType, modOpts); err != nil {
 					return err
 				}