diff --git a/react/src/components/ResourceAllocationFormItems.tsx b/react/src/components/ResourceAllocationFormItems.tsx
index aab7eccb2..3953bd5fd 100644
--- a/react/src/components/ResourceAllocationFormItems.tsx
+++ b/react/src/components/ResourceAllocationFormItems.tsx
@@ -1208,7 +1208,7 @@ const ResourceAllocationFormItems: React.FC<
         </Card>
       ) : null}
       {/* TODO: Support cluster mode */}
-      {enableAgentSelect && (
+      {enableAgentSelect && baiClient.supports('agent-select') && (
         <Form.Item
           label={t('session.launcher.SelectAgent')}
           required
@@ -1217,21 +1217,19 @@ const ResourceAllocationFormItems: React.FC<
           <Flex gap={'xs'}>
             <Suspense>
               <Form.Item required noStyle style={{ flex: 1 }} name="agent">
-                {baiClient.supports('agent-select') && (
-                  <AgentSelect
-                    resourceGroup={currentResourceGroup}
-                    fetchKey={agentFetchKey}
-                    onChange={(value, option) => {
-                      if (value !== 'auto') {
-                        form.setFieldsValue({
-                          cluster_mode: 'single-node',
-                          cluster_size: 1,
-                        });
-                      }
-                      // TODO: set cluster mode to single node and cluster size to 1 when agent value is not "auto"
-                    }}
-                  ></AgentSelect>
-                )}
+                <AgentSelect
+                  resourceGroup={currentResourceGroup}
+                  fetchKey={agentFetchKey}
+                  onChange={(value, option) => {
+                    if (value !== 'auto') {
+                      form.setFieldsValue({
+                        cluster_mode: 'single-node',
+                        cluster_size: 1,
+                      });
+                    }
+                    // TODO: set cluster mode to single node and cluster size to 1 when agent value is not "auto"
+                  }}
+                ></AgentSelect>
               </Form.Item>
             </Suspense>
             <Form.Item noStyle>