diff --git a/cmd/zetaclientd/start.go b/cmd/zetaclientd/start.go
index 211dbe8d8c..f6fda1b60f 100644
--- a/cmd/zetaclientd/start.go
+++ b/cmd/zetaclientd/start.go
@@ -237,12 +237,8 @@ func start(_ *cobra.Command, _ []string) error {
 	startLogger.Info().Msgf("stop signal received: %s", sig)
 
 	// stop zetacore observer
-	for _, chain := range cfg.GetEnabledChains() {
-		// zeta chain does not have a chain client
-		if chain.IsExternalChain() {
-			(chainClientMap)[chain].Stop()
-		}
-
+	for _, client := range chainClientMap {
+		client.Stop()
 	}
 	zetaBridge.Stop()