diff --git a/react/src/components/AgentSelect.tsx b/react/src/components/AgentSelect.tsx
index e7dceed765..6cdbd0bfc7 100644
--- a/react/src/components/AgentSelect.tsx
+++ b/react/src/components/AgentSelect.tsx
@@ -13,9 +13,14 @@ import { useLazyLoadQuery } from 'react-relay';
 interface Props extends SelectProps {
   autoSelectDefault?: boolean;
   fetchKey?: string;
+  resourceGroup?: string | null;
 }
 
-const AgentSelector: React.FC<Props> = ({ fetchKey, ...selectProps }) => {
+const AgentSelector: React.FC<Props> = ({
+  fetchKey,
+  resourceGroup,
+  ...selectProps
+}) => {
   const { t } = useTranslation();
   const [value, setValue] = useControllableValue(selectProps);
 
@@ -31,12 +36,14 @@ const AgentSelector: React.FC<Props> = ({ fetchKey, ...selectProps }) => {
         $offset: Int!
         $status: String
         $filter: String
+        $scaling_group: String
       ) {
         agent_summary_list(
           limit: $limit
           offset: $offset
           status: $status
           filter: $filter
+          scaling_group: $scaling_group
         ) {
           items {
             id
@@ -55,6 +62,7 @@ const AgentSelector: React.FC<Props> = ({ fetchKey, ...selectProps }) => {
       offset: baiPaginationOption.offset,
       status: 'ALIVE',
       filter: 'schedulable is true', // true, false, null
+      scaling_group: resourceGroup,
     },
     {
       fetchPolicy: 'network-only',
@@ -74,9 +82,9 @@ const AgentSelector: React.FC<Props> = ({ fetchKey, ...selectProps }) => {
     } = _.chain(availableSlotsInfo)
       .mapValues((value, key) => {
         if (key.endsWith('.shares')) {
-          return parseFloat(value) - parseFloat(occupiedSlotsInfo[key]);
+          return parseFloat(value) - parseFloat(occupiedSlotsInfo[key] ?? 0);
         } else {
-          return parseInt(value) - parseInt(occupiedSlotsInfo[key]);
+          return parseInt(value) - parseInt(occupiedSlotsInfo[key] ?? 0);
         }
       })
       .value();
@@ -103,6 +111,8 @@ const AgentSelector: React.FC<Props> = ({ fetchKey, ...selectProps }) => {
     };
   });
 
+  console.log(agentOptions);
+
   return (
     <Select
       onChange={(value, option) => {
diff --git a/react/src/components/ResourceAllocationFormItems.tsx b/react/src/components/ResourceAllocationFormItems.tsx
index 7c4db0eaa1..7c137722ad 100644
--- a/react/src/components/ResourceAllocationFormItems.tsx
+++ b/react/src/components/ResourceAllocationFormItems.tsx
@@ -66,6 +66,7 @@ export interface ResourceAllocationFormValue {
   cluster_size: number;
   enabledAutomaticShmem: boolean;
   allocationPreset?: string;
+  agent?: string;
 }
 
 type MergedResourceAllocationFormValue = ResourceAllocationFormValue &
@@ -1165,6 +1166,7 @@ const ResourceAllocationFormItems: React.FC<
           <Flex gap={'xs'}>
             <Form.Item required noStyle style={{ flex: 1 }} name="agent">
               <AgentSelector
+                resourceGroup={currentResourceGroup}
                 fetchKey={agentFetchKey}
                 onChange={(value, option) => {
                   if (value !== 'auto') {
diff --git a/react/src/pages/SessionLauncherPage.tsx b/react/src/pages/SessionLauncherPage.tsx
index ede39a13a0..08f1f90007 100644
--- a/react/src/pages/SessionLauncherPage.tsx
+++ b/react/src/pages/SessionLauncherPage.tsx
@@ -119,6 +119,7 @@ interface SessionConfig {
   startsAt?: string;
   startupCommand?: string;
   bootstrap_script?: string;
+  agent_list?: string;
 }
 
 interface CreateSessionInfo {
@@ -452,6 +453,9 @@ const SessionLauncherPage = () => {
               ..._.omit(values.hpcOptimization, 'autoEnabled'),
             },
             preopen_ports: transformPortValuesToNumbers(values.ports),
+            ...(!baiClient?._config?.hideAgents && values.agent !== 'auto'
+              ? { agent_list: values.agent }
+              : undefined),
           },
         };