diff --git a/app/cli/main.go b/app/cli/main.go
index 9189df0bc..757dc4206 100644
--- a/app/cli/main.go
+++ b/app/cli/main.go
@@ -65,13 +65,13 @@ func errorInfo(err error, logger zerolog.Logger) (string, int) {
 		var gs grpcstatus
 		if errors.As(err, &gs) {
 			knownCodes := []codes.Code{
-				codes.AlreadyExists, codes.InvalidArgument, codes.NotFound, codes.PermissionDenied,
+				codes.AlreadyExists, codes.InvalidArgument, codes.NotFound, codes.PermissionDenied, codes.Unauthenticated,
 			}
 
-			grpcStatus := gs.GRPCStatus()
+			st = gs.GRPCStatus()
 			for _, code := range knownCodes {
 				if st.Code() == code {
-					msg = grpcStatus.Message()
+					msg = st.Message()
 					break
 				}
 			}
diff --git a/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go b/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go
index c24297ad1..f82ab2f4b 100644
--- a/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go
+++ b/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go
@@ -310,7 +310,7 @@ func WithJWTMulti(l log.Logger, opts ...JWTOption) middleware.Middleware {
 							return handler(ctx, req)
 						}
 
-						return nil, fmt.Errorf("couldn't match JWT provider: %w", err)
+						return nil, err
 					}
 
 					// When reached this point, one match has happened meaning the auth context