diff --git a/api/orb/client.go b/api/orb/client.go
index 01aa20a52..a8e750a43 100644
--- a/api/orb/client.go
+++ b/api/orb/client.go
@@ -31,7 +31,7 @@ func NewClient(config *settings.Config) (Client, error) {
 
 	clientVersion, err := detectClientVersion(gql)
 	if err != nil {
-		return &v1Client{gql}, nil
+		return nil, err
 	}
 
 	switch clientVersion {
@@ -74,7 +74,7 @@ type OrbIntrospectionResponse struct {
 
 func orbQueryHandleOwnerId(gql *graphql.Client) (bool, error) {
 	query := `query IntrospectionQuery {
-	_schema {
+	__schema {
 		queryType {
 			fields(includeDeprecated: true) {
 				name
diff --git a/cmd/orb_test.go b/cmd/orb_test.go
index 66187398b..4804d1d6a 100644
--- a/cmd/orb_test.go
+++ b/cmd/orb_test.go
@@ -3713,7 +3713,7 @@ func mockOrbIntrospection(isValid bool, token string, tempSettings *clitest.Temp
 
 	requestStruct := map[string]interface{}{
 		"query": `query IntrospectionQuery {
-	_schema {
+	__schema {
 		queryType {
 			fields(includeDeprecated: true) {
 				name