diff --git a/web/src/app/admin/assistants/AssistantEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
index 8f841ed9b46..b01b6f32588 100644
--- a/web/src/app/admin/assistants/AssistantEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -565,7 +565,7 @@ export function AssistantEditor({
                   align="start"
                   side="bottom"
                 />
-                <TooltipProvider delayDuration={50}>
+                <TooltipProvider>
                   <Tooltip>
                     <TooltipTrigger>
                       <FiInfo size={12} />
@@ -607,7 +607,7 @@ export function AssistantEditor({
                   <div className="block  font-medium text-base">
                     Default AI Model{" "}
                   </div>
-                  <TooltipProvider delayDuration={50}>
+                  <TooltipProvider>
                     <Tooltip>
                       <TooltipTrigger>
                         <FiInfo size={12} />
@@ -702,7 +702,7 @@ export function AssistantEditor({
                   <div className="block font-medium text-base">
                     Capabilities{" "}
                   </div>
-                  <TooltipProvider delayDuration={50}>
+                  <TooltipProvider>
                     <Tooltip>
                       <TooltipTrigger>
                         <FiInfo size={12} />
@@ -720,7 +720,7 @@ export function AssistantEditor({
 
                 <div className="mt-4 flex flex-col gap-y-4  ml-1">
                   {imageGenerationTool && (
-                    <TooltipProvider delayDuration={50}>
+                    <TooltipProvider>
                       <Tooltip>
                         <TooltipTrigger asChild>
                           <div
@@ -768,7 +768,7 @@ export function AssistantEditor({
                   )}
 
                   {searchTool && (
-                    <TooltipProvider delayDuration={50}>
+                    <TooltipProvider>
                       <Tooltip>
                         <TooltipTrigger asChild>
                           <div
diff --git a/web/src/app/chat/files/InputBarPreview.tsx b/web/src/app/chat/files/InputBarPreview.tsx
index 39f39b8cf66..6cd9478ec07 100644
--- a/web/src/app/chat/files/InputBarPreview.tsx
+++ b/web/src/app/chat/files/InputBarPreview.tsx
@@ -143,7 +143,7 @@ export function InputBarPreview({
           </div>
         </div>
         <div className="ml-2 relative">
-          <TooltipProvider delayDuration={50}>
+          <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
                 <div
diff --git a/web/src/app/chat/files/documents/DocumentPreview.tsx b/web/src/app/chat/files/documents/DocumentPreview.tsx
index f89fa3d62ea..ed1dc43e797 100644
--- a/web/src/app/chat/files/documents/DocumentPreview.tsx
+++ b/web/src/app/chat/files/documents/DocumentPreview.tsx
@@ -57,7 +57,7 @@ export function DocumentPreview({
         </div>
       </div>
       <div className="ml-4 flex-grow">
-        <TooltipProvider delayDuration={50}>
+        <TooltipProvider>
           <Tooltip>
             <TooltipTrigger asChild>
               <div
@@ -140,7 +140,7 @@ export function InputDocumentPreview({
         </div>
       </div>
       <div className="ml-2 relative">
-        <TooltipProvider delayDuration={50}>
+        <TooltipProvider>
           <Tooltip>
             <TooltipTrigger asChild>
               <div
diff --git a/web/src/app/chat/message/SearchSummary.tsx b/web/src/app/chat/message/SearchSummary.tsx
index 8d903be9767..f86212fd290 100644
--- a/web/src/app/chat/message/SearchSummary.tsx
+++ b/web/src/app/chat/message/SearchSummary.tsx
@@ -174,8 +174,8 @@ export function SearchSummary({
             )}
           </div>
           {handleSearchQueryEdit && (
-            <TooltipProvider>
-              <Tooltip delayDuration={1000}>
+            <TooltipProvider delayDuration={1000}>
+              <Tooltip>
                 <TooltipTrigger asChild>
                   <button
                     className="my-auto hover:bg-hover p-1.5 rounded"
diff --git a/web/src/components/admin/connectors/Field.tsx b/web/src/components/admin/connectors/Field.tsx
index 28e9a49476f..106478869e3 100644
--- a/web/src/components/admin/connectors/Field.tsx
+++ b/web/src/components/admin/connectors/Field.tsx
@@ -107,7 +107,7 @@ export function ToolTipDetails({
   children: string | JSX.Element;
 }) {
   return (
-    <TooltipProvider delayDuration={50}>
+    <TooltipProvider>
       <Tooltip>
         <TooltipTrigger>
           <FiInfo size={12} />
diff --git a/web/src/components/header/LogoType.tsx b/web/src/components/header/LogoType.tsx
index fd6a16ffa93..365c734ade9 100644
--- a/web/src/components/header/LogoType.tsx
+++ b/web/src/components/header/LogoType.tsx
@@ -81,8 +81,8 @@ export default function LogoType({
       </div>
 
       {page == "chat" && !showArrow && (
-        <TooltipProvider>
-          <Tooltip delayDuration={1000}>
+        <TooltipProvider delayDuration={1000}>
+          <Tooltip>
             <TooltipTrigger asChild>
               <Link
                 className="my-auto mobile:hidden"
@@ -111,8 +111,8 @@ export default function LogoType({
         </TooltipProvider>
       )}
       {showArrow && toggleSidebar && (
-        <TooltipProvider>
-          <Tooltip delayDuration={0}>
+        <TooltipProvider delayDuration={0}>
+          <Tooltip>
             <TooltipTrigger asChild>
               <button
                 className="mr-3 my-auto ml-auto"