diff --git a/react/src/components/EndpointSelect.tsx b/react/src/components/EndpointSelect.tsx
index 0b5643d3c7..e6bd20f904 100644
--- a/react/src/components/EndpointSelect.tsx
+++ b/react/src/components/EndpointSelect.tsx
@@ -28,9 +28,8 @@ const EndpointSelect: React.FC<EndpointSelectProps> = ({
   ...selectPropsWithoutLoading
 }) => {
   const baiClient = useSuspendedBackendaiClient();
-  const [controllableValue, setControllableValue] = useControllableValue(
-    selectPropsWithoutLoading,
-  );
+  const [controllableValue, setControllableValue] =
+    useControllableValue<string>(selectPropsWithoutLoading);
   const [searchStr, setSearchStr] = useState<string>();
   const [isSearchPending, startSearchTransition] = useTransition();
 
@@ -62,7 +61,7 @@ const EndpointSelect: React.FC<EndpointSelectProps> = ({
             ...EndpointLLMChatCard_endpoint
           }
         }
-        endpoint(endpoint_id: $endpoint_id) @skip(if: $skipEndpoint) {
+        endpoint(endpoint_id: $endpoint_id) @skipOnClient(if: $skipEndpoint) {
           name
           endpoint_id
           ...EndpointLLMChatCard_endpoint