diff --git a/packages/app/src/cli/api/graphql/business-platform-destinations/generated/find-organizations.ts b/packages/app/src/cli/api/graphql/business-platform-destinations/generated/find-organizations.ts
deleted file mode 100644
index 70c948f0e2c..00000000000
--- a/packages/app/src/cli/api/graphql/business-platform-destinations/generated/find-organizations.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-import * as Types from './types.js'
-
-import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
-
-export type FindOrganizationsQueryVariables = Types.Exact<{
-  organizationId: Types.Scalars['OrganizationID']['input']
-}>
-
-export type FindOrganizationsQuery = {currentUserAccount?: {organization?: {id: string; name: string} | null} | null}
-
-export const FindOrganizations = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: {kind: 'Name', value: 'FindOrganizations'},
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: {kind: 'Variable', name: {kind: 'Name', value: 'organizationId'}},
-          type: {kind: 'NonNullType', type: {kind: 'NamedType', name: {kind: 'Name', value: 'OrganizationID'}}},
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: {kind: 'Name', value: 'currentUserAccount'},
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                {
-                  kind: 'Field',
-                  name: {kind: 'Name', value: 'organization'},
-                  arguments: [
-                    {
-                      kind: 'Argument',
-                      name: {kind: 'Name', value: 'id'},
-                      value: {kind: 'Variable', name: {kind: 'Name', value: 'organizationId'}},
-                    },
-                  ],
-                  selectionSet: {
-                    kind: 'SelectionSet',
-                    selections: [
-                      {kind: 'Field', name: {kind: 'Name', value: 'id'}},
-                      {kind: 'Field', name: {kind: 'Name', value: 'name'}},
-                      {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
-                    ],
-                  },
-                },
-                {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<FindOrganizationsQuery, FindOrganizationsQueryVariables>
diff --git a/packages/app/src/cli/api/graphql/business-platform-destinations/queries/find-organizations.graphql b/packages/app/src/cli/api/graphql/business-platform-destinations/queries/find-organizations.graphql
deleted file mode 100644
index ebf8b3667d0..00000000000
--- a/packages/app/src/cli/api/graphql/business-platform-destinations/queries/find-organizations.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query FindOrganizations($organizationId: OrganizationID!) {
-  currentUserAccount {
-    organization(id: $organizationId) {
-      id
-      name
-    }
-  }
-}
diff --git a/packages/app/src/cli/api/graphql/business-platform-organizations/generated/find_organization.ts b/packages/app/src/cli/api/graphql/business-platform-organizations/generated/find_organization.ts
new file mode 100644
index 00000000000..944e76cd76c
--- /dev/null
+++ b/packages/app/src/cli/api/graphql/business-platform-organizations/generated/find_organization.ts
@@ -0,0 +1,36 @@
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+import * as Types from './types.js'
+
+import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
+
+export type FindOrganizationQueryVariables = Types.Exact<{[key: string]: never}>
+
+export type FindOrganizationQuery = {organization?: {id: string; name: string} | null}
+
+export const FindOrganization = {
+  kind: 'Document',
+  definitions: [
+    {
+      kind: 'OperationDefinition',
+      operation: 'query',
+      name: {kind: 'Name', value: 'FindOrganization'},
+      selectionSet: {
+        kind: 'SelectionSet',
+        selections: [
+          {
+            kind: 'Field',
+            name: {kind: 'Name', value: 'organization'},
+            selectionSet: {
+              kind: 'SelectionSet',
+              selections: [
+                {kind: 'Field', name: {kind: 'Name', value: 'id'}},
+                {kind: 'Field', name: {kind: 'Name', value: 'name'}},
+                {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
+              ],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<FindOrganizationQuery, FindOrganizationQueryVariables>
diff --git a/packages/app/src/cli/api/graphql/business-platform-organizations/queries/find_organization.graphql b/packages/app/src/cli/api/graphql/business-platform-organizations/queries/find_organization.graphql
new file mode 100644
index 00000000000..a47d454de1c
--- /dev/null
+++ b/packages/app/src/cli/api/graphql/business-platform-organizations/queries/find_organization.graphql
@@ -0,0 +1,6 @@
+query FindOrganization {
+  organization {
+    id
+    name
+  }
+}
diff --git a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts
index f74ceebd240..0f4eaf6e371 100644
--- a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts
+++ b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts
@@ -115,7 +115,6 @@ import {AppVersions} from '../../api/graphql/app-management/generated/app-versio
 import {CreateApp, CreateAppMutationVariables} from '../../api/graphql/app-management/generated/create-app.js'
 import {FetchSpecifications} from '../../api/graphql/app-management/generated/specifications.js'
 import {ListApps} from '../../api/graphql/app-management/generated/apps.js'
-import {FindOrganizations} from '../../api/graphql/business-platform-destinations/generated/find-organizations.js'
 import {UserInfo} from '../../api/graphql/business-platform-destinations/generated/user-info.js'
 import {AvailableTopics} from '../../api/graphql/webhooks/generated/available-topics.js'
 import {CliTesting} from '../../api/graphql/webhooks/generated/cli-testing.js'
@@ -137,6 +136,7 @@ import {
   AppLogsSubscribeMutationVariables,
 } from '../../api/graphql/app-management/generated/app-logs-subscribe.js'
 import {SourceExtension} from '../../api/graphql/app-management/generated/types.js'
+import {FindOrganization} from '../../api/graphql/business-platform-organizations/generated/find_organization.js'
 import {getPartnersToken} from '@shopify/cli-kit/node/environment'
 import {ensureAuthenticatedAppManagementAndBusinessPlatform, Session} from '@shopify/cli-kit/node/session'
 import {isUnitTest} from '@shopify/cli-kit/node/context/local'
@@ -383,14 +383,12 @@ export class AppManagementClient implements DeveloperPlatformClient {
   }
 
   async orgFromId(orgId: string): Promise<Organization | undefined> {
-    const base64Id = encodedGidFromOrganizationIdForBP(orgId)
-    const variables = {organizationId: base64Id}
-    const organizationResult = await this.businessPlatformRequest({
-      query: FindOrganizations,
-      variables,
+    const organizationResult = await this.businessPlatformOrganizationsRequest({
+      query: FindOrganization,
+      organizationId: orgId,
       cacheOptions: {cacheTTL: {hours: 6}},
     })
-    const org = organizationResult.currentUserAccount?.organization
+    const org = organizationResult.organization
     if (!org) {
       return
     }