diff --git a/web/app/components/tools/mcp/detail/content.tsx b/web/app/components/tools/mcp/detail/content.tsx
index 05e2572170..fd1457d40c 100644
--- a/web/app/components/tools/mcp/detail/content.tsx
+++ b/web/app/components/tools/mcp/detail/content.tsx
@@ -194,7 +194,7 @@ const MCPDetailContent: FC<Props> = ({
             </div>
           </>
         )}
-        {!isGettingTools && !toolList.length && (
+        {detail.is_team_authorization && !isGettingTools && !toolList.length && (
           <div className='flex h-full w-full flex-col items-center justify-center'>
             <div className='system-sm-regular mb-3 text-text-tertiary'>{t('tools.mcp.toolsEmpty')}</div>
             <Button
diff --git a/web/app/components/tools/mcp/index.tsx b/web/app/components/tools/mcp/index.tsx
index 729117800f..1b5d6a9fc5 100644
--- a/web/app/components/tools/mcp/index.tsx
+++ b/web/app/components/tools/mcp/index.tsx
@@ -41,7 +41,7 @@ const MCPList = ({
 }: Props) => {
   const searchParams = useSearchParams()
   const authCode = searchParams.get('code') || ''
-  const providerID = decodeURIComponent(searchParams.get('state') || '').split('provider_id=')[1] || ''
+  const providerID = searchParams.get('state') || ''
 
   const { data: list = [], refetch } = useAllMCPTools()
   const { mutateAsync: authorizeMcp } = useAuthorizeMCP()
@@ -92,9 +92,9 @@ const MCPList = ({
   }
 
   useEffect(() => {
-    if (authCode && providerID)
+    if (authCode && providerID && list.length > 0)
       handleUpdateAuthorization(providerID, authCode)
-  }, [authCode, providerID])
+  }, [authCode, providerID, list])
 
   return (
     <>
diff --git a/web/app/components/tools/provider-list.tsx b/web/app/components/tools/provider-list.tsx
index 647271e840..8aee0beb0e 100644
--- a/web/app/components/tools/provider-list.tsx
+++ b/web/app/components/tools/provider-list.tsx
@@ -28,7 +28,7 @@ const ProviderList = () => {
 
   const searchParams = useSearchParams()
   const authCode = searchParams.get('code') || ''
-  const providerID = decodeURIComponent(searchParams.get('state') || '').split('provider_id=')[1] || ''
+  const providerID = searchParams.get('state') || ''
 
   const [activeTab, setActiveTab] = useTabSearchParams({
     defaultTab: authCode && providerID ? 'mcp' : 'builtin',