diff --git a/pkg/cmdutil/auth_check.go b/pkg/cmdutil/auth_check.go
index d433d79dab0..ac81320fae4 100644
--- a/pkg/cmdutil/auth_check.go
+++ b/pkg/cmdutil/auth_check.go
@@ -37,8 +37,9 @@ func CheckAuth(cfg config.Config) bool {
 }
 
 func IsAuthCheckEnabled(cmd *cobra.Command) bool {
-	if cmd.Name() == "help" {
-		return false
+	switch cmd.Name() {
+		case "help", cobra.ShellCompRequestCmd, cobra.ShellCompNoDescRequestCmd:
+			return false
 	}
 
 	for c := cmd; c.Parent() != nil; c = c.Parent() {