diff --git a/src/interfaces/assistants_web/src/components/AgentSettingsForm/ToolsStep.tsx b/src/interfaces/assistants_web/src/components/AgentSettingsForm/ToolsStep.tsx
index a3fb38a40e..121a1efed2 100644
--- a/src/interfaces/assistants_web/src/components/AgentSettingsForm/ToolsStep.tsx
+++ b/src/interfaces/assistants_web/src/components/AgentSettingsForm/ToolsStep.tsx
@@ -39,7 +39,7 @@ export const ToolsStep: React.FC<Props> = ({ tools, activeTools, setActiveTools,
                       checked={!!activeTools?.includes(name)}
                       handleSwitch={(checked: boolean) => handleUpdateActiveTools(checked, name)}
                       isAuthRequired={is_auth_required}
-                      authUrl={auth_url}
+                      authUrl={auth_url?.toString()}
                       handleAuthButtonClick={handleAuthButtonClick}
                   />
               )
@@ -90,7 +90,7 @@ const ToolRow: React.FC<{
           kind="outline"
           theme="mushroom"
           label="Authenticate"
-          onClick={() => handleAuthButtonClick(name)}
+          onClick={() => handleAuthButtonClick ? handleAuthButtonClick(name) : ''}
       />)}
     </div>
   );
diff --git a/src/interfaces/assistants_web/src/components/AgentSettingsForm/index.tsx b/src/interfaces/assistants_web/src/components/AgentSettingsForm/index.tsx
index 243a1fe370..d975f74939 100644
--- a/src/interfaces/assistants_web/src/components/AgentSettingsForm/index.tsx
+++ b/src/interfaces/assistants_web/src/components/AgentSettingsForm/index.tsx
@@ -177,7 +177,7 @@ export const AgentSettingsForm: React.FC<Props> = (props) => {
     }
   };
 
-  const handleAuthButtonClick = (tool_name) => {
+  const handleAuthButtonClick = (tool_name: string) => {
     const tool = listToolsData?.find((t) => t.name === tool_name);
     if (!tool?.is_available) {
       return;