diff --git a/frontend/src/hooks/api/groups/queries.tsx b/frontend/src/hooks/api/groups/queries.tsx
index 910c8cdd3..a6ddb568c 100644
--- a/frontend/src/hooks/api/groups/queries.tsx
+++ b/frontend/src/hooks/api/groups/queries.tsx
@@ -3,8 +3,8 @@ import { useQuery } from "@tanstack/react-query";
 import { apiRequest } from "@app/config/request";
 
 export const groupKeys = {
-    getGroupUserMembership: (slug: string) => [{ slug }, "group-user-memberships"] as const
-}
+  getGroupUserMembership: (slug: string) => [{ slug }, "group-user-memberships"] as const
+};
 
 type TUser = {
   id: string;
@@ -13,17 +13,16 @@ type TUser = {
   firstName: string;
   lastName: string;
   isPartOfGroup: boolean;
-}
+};
 
 export const useListGroupUsers = (groupSlug: string) => {
   return useQuery({
     queryKey: groupKeys.getGroupUserMembership(groupSlug),
+    enabled: Boolean(groupSlug),
     queryFn: async () => {
-      const {
-        data: users
-      } = await apiRequest.get<TUser[]>(`/api/v1/groups/${groupSlug}/users`);
-      
+      const { data: users } = await apiRequest.get<TUser[]>(`/api/v1/groups/${groupSlug}/users`);
+
       return users;
     }
   });
-};
\ No newline at end of file
+};
diff --git a/frontend/src/hooks/api/organization/queries.tsx b/frontend/src/hooks/api/organization/queries.tsx
index aee5b1ebf..5c57428df 100644
--- a/frontend/src/hooks/api/organization/queries.tsx
+++ b/frontend/src/hooks/api/organization/queries.tsx
@@ -28,7 +28,8 @@ export const organizationKeys = {
   getOrgTaxIds: (orgId: string) => [{ orgId }, "organization-tax-ids"] as const,
   getOrgInvoices: (orgId: string) => [{ orgId }, "organization-invoices"] as const,
   getOrgLicenses: (orgId: string) => [{ orgId }, "organization-licenses"] as const,
-  getOrgIdentityMemberships: (orgId: string) => [{ orgId }, "organization-identity-memberships"] as const,
+  getOrgIdentityMemberships: (orgId: string) =>
+    [{ orgId }, "organization-identity-memberships"] as const,
   getOrgGroups: (orgId: string) => [{ orgId }, "organization-groups"] as const
 };
 
@@ -409,12 +410,15 @@ export const useDeleteOrgById = () => {
 export const useGetOrganizationGroups = (organizationId: string) => {
   return useQuery({
     queryKey: organizationKeys.getOrgGroups(organizationId),
+    enabled: Boolean(organizationId),
     queryFn: async () => {
       const {
         data: { groups }
-      } = await apiRequest.get<{ groups: TGroupOrgMembership[] }>(`/api/v1/organization/${organizationId}/groups`);
-      
+      } = await apiRequest.get<{ groups: TGroupOrgMembership[] }>(
+        `/api/v1/organization/${organizationId}/groups`
+      );
+
       return groups;
     }
   });
-};
\ No newline at end of file
+};