diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx b/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx
index 914124246..4431f354b 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx
@@ -52,7 +52,7 @@ export const AddEditOrganization = (props: AddEditOrganizationProps) => {
 
   const practitioners = useQuery(
     [practitionerResourceType],
-    () => loadAllResources(fhirBaseUrl, practitionerResourceType),
+    () => loadAllResources(fhirBaseUrl, practitionerResourceType, { active: true }),
     {
       select: (res) => getResourcesFromBundle(res) as IPractitionerRole[],
       onError: () => sendErrorNotification(t('There was a problem fetching practitioners')),
@@ -62,7 +62,7 @@ export const AddEditOrganization = (props: AddEditOrganizationProps) => {
   // practitioners already assigned to this organization
   const allPractitionerRoles = useQuery(
     [practitionerResourceType, organizationResourceType, orgId],
-    () => loadAllResources(fhirBaseUrl, practitionerRoleResourceType),
+    () => loadAllResources(fhirBaseUrl, practitionerRoleResourceType, { active: true }),
     {
       onError: () =>
         sendErrorNotification(t('There was a problem fetching assigned practitioners')),
@@ -74,9 +74,12 @@ export const AddEditOrganization = (props: AddEditOrganizationProps) => {
   );
 
   if (
-    (!organization.isIdle && organization.isLoading) ||
-    (!practitioners.isIdle && practitioners.isLoading) ||
-    (!allPractitionerRoles.isIdle && allPractitionerRoles.isLoading)
+    organization.isLoading ||
+    organization.isFetching ||
+    practitioners.isLoading ||
+    practitioners.isFetching ||
+    allPractitionerRoles.isLoading ||
+    allPractitionerRoles.isFetching
   ) {
     return <Spin size="large" className="custom-spinner"></Spin>;
   }
diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx b/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx
index ee04d6346..c74859872 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx
@@ -101,20 +101,20 @@ test('renders correctly for edit locations', async () => {
 
   nock(props.fhirBaseURL)
     .get(`/${practitionerResourceType}/_search`)
-    .query({ _summary: 'count' })
+    .query({ _summary: 'count', active: true })
     .reply(200, { total: 1000 })
     .get(`/${practitionerResourceType}/_search`)
-    .query({ _count: 1000 })
+    .query({ _count: 1000, active: true })
     .reply(200, allPractitioners);
 
   nock(props.fhirBaseURL).get(`/${organizationResourceType}/${org105.id}`).reply(200, org105);
 
   nock(props.fhirBaseURL)
     .get(`/${practitionerRoleResourceType}/_search`)
-    .query({ _summary: 'count' })
+    .query({ _summary: 'count', active: true })
     .reply(200, { total: 1000 })
     .get(`/${practitionerRoleResourceType}/_search`)
-    .query({ _count: 1000 })
+    .query({ _count: 1000, active: true })
     .reply(200, allPractitioners);
 
   render(