diff --git a/pkg/api/handlers/agent.go b/pkg/api/handlers/agent.go
index c47bbc977..0746cc4c9 100644
--- a/pkg/api/handlers/agent.go
+++ b/pkg/api/handlers/agent.go
@@ -417,12 +417,6 @@ func (a *AgentHandler) ReSyncKnowledgeSource(req api.Context) error {
 		return err
 	}
 
-	knowledgeSource.Status.SyncState = types.KnowledgeSourceStatePending
-	knowledgeSource.Status.Status = ""
-	if err := req.Storage.Status().Update(req.Context(), &knowledgeSource); err != nil {
-		return err
-	}
-
 	req.WriteHeader(http.StatusNoContent)
 	return nil
 }
diff --git a/ui/admin/app/components/knowledge/AgentKnowledgePanel.tsx b/ui/admin/app/components/knowledge/AgentKnowledgePanel.tsx
index 8c406031a..dd360613d 100644
--- a/ui/admin/app/components/knowledge/AgentKnowledgePanel.tsx
+++ b/ui/admin/app/components/knowledge/AgentKnowledgePanel.tsx
@@ -2,7 +2,11 @@ import { Globe, SettingsIcon, UploadIcon } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import useSWR, { SWRResponse } from "swr";
 
-import { KnowledgeFile, KnowledgeFileState } from "~/lib/model/knowledge";
+import {
+    KnowledgeFile,
+    KnowledgeFileState,
+    KnowledgeSourceStatus,
+} from "~/lib/model/knowledge";
 import { KnowledgeService } from "~/lib/service/api/knowledgeService";
 import { assetUrl } from "~/lib/utils";
 
@@ -60,7 +64,12 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         ({ agentId }) => KnowledgeService.getKnowledgeSourcesForAgent(agentId),
         {
             revalidateOnFocus: false,
-            refreshInterval: 5000,
+            refreshInterval:
+                blockPollingNotion &&
+                blockPollingOneDrive &&
+                blockPollingWebsite
+                    ? undefined
+                    : 1000,
         }
     );
     const knowledgeSources = useMemo(
@@ -68,11 +77,11 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         [getKnowledgeSources.data]
     );
 
-    const notionSource = knowledgeSources.find((source) => source.notionConfig);
-    const onedriveSource = knowledgeSources.find(
+    let notionSource = knowledgeSources.find((source) => source.notionConfig);
+    let onedriveSource = knowledgeSources.find(
         (source) => source.onedriveConfig
     );
-    const websiteSource = knowledgeSources.find(
+    let websiteSource = knowledgeSources.find(
         (source) => source.websiteCrawlingConfig
     );
 
@@ -155,6 +164,10 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
             await KnowledgeService.createKnowledgeSource(agentId, {
                 notionConfig: {},
             });
+            getKnowledgeSources.mutate();
+            notionSource = getKnowledgeSources.data?.find(
+                (source) => source.notionConfig
+            );
         }
         setIsNotionModalOpen(true);
     };
@@ -174,16 +187,19 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
 
     const startPollingNotion = () => {
         getNotionFiles.mutate();
+        getKnowledgeSources.mutate();
         setBlockPollingNotion(false);
     };
 
     const startPollingOneDrive = () => {
         getOnedriveFiles.mutate();
+        getKnowledgeSources.mutate();
         setBlockPollingOneDrive(false);
     };
 
     const startPollingWebsite = () => {
         getWebsiteFiles.mutate();
+        getKnowledgeSources.mutate();
         setBlockPollingWebsite(false);
     };
 
@@ -232,6 +248,45 @@ export default function AgentKnowledgePanel({ agentId }: { agentId: string }) {
         }
     }, [websiteFiles]);
 
+    useEffect(() => {
+        notionSource = knowledgeSources.find((source) => source.notionConfig);
+        if (
+            !notionSource ||
+            notionSource?.state === KnowledgeSourceStatus.Synced
+        ) {
+            getNotionFiles.mutate();
+            setBlockPollingNotion(true);
+        } else {
+            setBlockPollingNotion(false);
+        }
+
+        onedriveSource = knowledgeSources.find(
+            (source) => source.onedriveConfig
+        );
+        if (
+            !onedriveSource ||
+            onedriveSource?.state === KnowledgeSourceStatus.Synced
+        ) {
+            getOnedriveFiles.mutate();
+            setBlockPollingOneDrive(true);
+        } else {
+            setBlockPollingOneDrive(false);
+        }
+
+        websiteSource = knowledgeSources.find(
+            (source) => source.websiteCrawlingConfig
+        );
+        if (
+            !websiteSource ||
+            websiteSource?.state === KnowledgeSourceStatus.Synced
+        ) {
+            getWebsiteFiles.mutate();
+            setBlockPollingWebsite(true);
+        } else {
+            setBlockPollingWebsite(false);
+        }
+    }, [getKnowledgeSources]);
+
     return (
         <div className="flex flex-col gap-4 justify-center items-center">
             <div className="flex w-full items-center justify-between gap-3 rounded-md bg-background px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-muted-foreground/20 focus-visible:ring-transparent">
diff --git a/ui/admin/app/components/knowledge/RemoteKnowledgeSourceStatus.tsx b/ui/admin/app/components/knowledge/RemoteKnowledgeSourceStatus.tsx
index 31d1663de..bb47a932d 100644
--- a/ui/admin/app/components/knowledge/RemoteKnowledgeSourceStatus.tsx
+++ b/ui/admin/app/components/knowledge/RemoteKnowledgeSourceStatus.tsx
@@ -19,18 +19,18 @@ const RemoteKnowledgeSourceStatus: React.FC<
     RemoteKnowledgeSourceStatusProps
 > = ({ source, sourceType }) => {
     return (
-        <div className="flex flex-row mt-2 flex items-center">
+        <div className="flex flex-row mt-2 flex items-center max-w-[80%]">
             {(source?.state === KnowledgeSourceStatus.Syncing ||
                 source?.state === KnowledgeSourceStatus.Pending) && (
-                <>
+                <div className="flex flex-row items-center">
                     <RemoteFileAvatar knowledgeSourceType={sourceType} />
-                    <span className="text-sm mr-2 text-gray-500">
+                    <span className="text-sm mr-2 text-gray-500 flex items-center">
                         {source.status || "Syncing Files..."}
+                        <LoadingSpinner className="w-4 h-4 ml-2" />
                     </span>
-                    <LoadingSpinner className="w-4 h-4" />
-                </>
+                </div>
             )}
-            {source?.state === "error" && (
+            {source?.state === KnowledgeSourceStatus.Error && (
                 <span className="text-sm mr-2 text-destructive">
                     {source.error}
                 </span>
diff --git a/ui/admin/app/components/knowledge/notion/NotionModal.tsx b/ui/admin/app/components/knowledge/notion/NotionModal.tsx
index 620eef1aa..f82882707 100644
--- a/ui/admin/app/components/knowledge/notion/NotionModal.tsx
+++ b/ui/admin/app/components/knowledge/notion/NotionModal.tsx
@@ -5,7 +5,6 @@ import {
     KnowledgeFile,
     KnowledgeFileState,
     KnowledgeSource,
-    KnowledgeSourceStatus,
     RemoteKnowledgeSourceType,
 } from "~/lib/model/knowledge";
 import { KnowledgeService } from "~/lib/service/api/knowledgeService";
@@ -199,7 +198,7 @@ export const NotionModal: FC<NotionModalProps> = ({
                 {files?.some(
                     (item) => item.state === KnowledgeFileState.Ingesting
                 ) && <IngestionStatusComponent files={files} />}
-                {knowledgeSource?.state === KnowledgeSourceStatus.Syncing && (
+                {!authUrl && (
                     <RemoteKnowledgeSourceStatus
                         source={knowledgeSource}
                         sourceType={RemoteKnowledgeSourceType.Notion}
diff --git a/ui/admin/app/components/knowledge/onedrive/OneDriveModal.tsx b/ui/admin/app/components/knowledge/onedrive/OneDriveModal.tsx
index 15d7ae90c..955b741a1 100644
--- a/ui/admin/app/components/knowledge/onedrive/OneDriveModal.tsx
+++ b/ui/admin/app/components/knowledge/onedrive/OneDriveModal.tsx
@@ -294,7 +294,6 @@ export const OnedriveModal: FC<OnedriveModalProps> = ({
                                             ) : (
                                                 <span className="flex items-center">
                                                     Processing OneDrive link...
-                                                    <LoadingSpinner className="ml-2 h-4 w-4" />
                                                 </span>
                                             )}
                                         </span>
@@ -444,10 +443,12 @@ export const OnedriveModal: FC<OnedriveModalProps> = ({
                 {files?.some((item) => item.approved) && (
                     <IngestionStatusComponent files={files} />
                 )}
-                <RemoteKnowledgeSourceStatus
-                    source={knowledgeSource}
-                    sourceType={RemoteKnowledgeSourceType.OneDrive}
-                />
+                {!authUrl && (
+                    <RemoteKnowledgeSourceStatus
+                        source={knowledgeSource}
+                        sourceType={RemoteKnowledgeSourceType.OneDrive}
+                    />
+                )}
                 <div className="mt-4 flex justify-between">
                     <Button
                         className="approve-button"
diff --git a/ui/admin/app/components/knowledge/website/WebsiteModal.tsx b/ui/admin/app/components/knowledge/website/WebsiteModal.tsx
index 732bfedd6..134dd7e65 100644
--- a/ui/admin/app/components/knowledge/website/WebsiteModal.tsx
+++ b/ui/admin/app/components/knowledge/website/WebsiteModal.tsx
@@ -173,110 +173,106 @@ export const WebsiteModal: FC<WebsiteModalProps> = ({
                         </TooltipProvider>
                     </div>
                 </DialogTitle>
-                <ScrollArea className="max-h-[45vh] overflow-x-auto">
-                    <div className="max-h-[400px] overflow-x-auto">
-                        {websites.map((website, index) => (
-                            <ScrollArea
+                <div className="max-h-[600px] overflow-x-auto">
+                    {websites.map((website, index) => (
+                        <ScrollArea
+                            key={index}
+                            className="max-h-[400px] overflow-x-auto"
+                        >
+                            {/* eslint-disable-next-line */}
+                            <div
                                 key={index}
-                                className="max-h-[400px] overflow-x-auto"
+                                className="flex items-center justify-between mb-2 overflow-x-auto"
+                                onClick={() => {
+                                    if (
+                                        showTable[index] === undefined ||
+                                        showTable[index] === false
+                                    ) {
+                                        setShowTable((prev) => ({
+                                            ...prev,
+                                            [index]: true,
+                                        }));
+                                    } else {
+                                        setShowTable((prev) => ({
+                                            ...prev,
+                                            [index]: false,
+                                        }));
+                                    }
+                                }}
                             >
-                                {/* eslint-disable-next-line */}
-                                <div
-                                    key={index}
-                                    className="flex items-center justify-between mb-2 overflow-x-auto"
-                                    onClick={() => {
-                                        if (
-                                            showTable[index] === undefined ||
-                                            showTable[index] === false
-                                        ) {
-                                            setShowTable((prev) => ({
-                                                ...prev,
-                                                [index]: true,
-                                            }));
-                                        } else {
-                                            setShowTable((prev) => ({
-                                                ...prev,
-                                                [index]: false,
-                                            }));
-                                        }
-                                    }}
-                                >
-                                    <span className="flex-1 mr-2 overflow-x-auto whitespace-nowrap dark:text-white">
-                                        <div className="flex items-center flex-r">
-                                            <Globe className="mr-2 h-4 w-4" />
-                                            <a
-                                                href={website}
-                                                target="_blank"
-                                                rel="noopener noreferrer"
-                                                className="underline"
-                                            >
-                                                {website}
-                                            </a>
-                                        </div>
-                                    </span>
-                                    <Button
-                                        variant="ghost"
-                                        onClick={() =>
-                                            handleRemoveWebsite(index)
-                                        }
-                                    >
-                                        <Trash className="h-4 w-4 dark:text-white" />
-                                    </Button>
-                                    {showTable[index] ? (
-                                        <ChevronUp className="h-4 w-4" />
-                                    ) : (
-                                        <ChevronDown className="h-4 w-4" />
-                                    )}
-                                </div>
-                                {showTable[index] && (
-                                    <div className="flex flex-col gap-2">
-                                        {files
-                                            .filter((item) => {
-                                                return (
-                                                    knowledgeSource?.syncDetails
-                                                        ?.websiteCrawlingState
-                                                        ?.pages?.[item.url!]
-                                                        ?.parentURL === website
-                                                );
-                                            })
-                                            .sort((a, b) =>
-                                                a.url!.localeCompare(b.url!)
-                                            )
-                                            .map((item) => (
-                                                <RemoteFileItemChip
-                                                    key={item.fileName}
-                                                    file={item}
-                                                    fileName={item.fileName}
-                                                    knowledgeSourceType={
-                                                        RemoteKnowledgeSourceType.Website
-                                                    }
-                                                    approveFile={async (
-                                                        file,
-                                                        approved
-                                                    ) => {
-                                                        await KnowledgeService.approveFile(
-                                                            agentId,
-                                                            file.id,
-                                                            approved
-                                                        );
-                                                        startPolling();
-                                                    }}
-                                                    reingestFile={(file) => {
-                                                        KnowledgeService.reingestFile(
-                                                            file.agentID,
-                                                            file.knowledgeSourceID,
-                                                            file.id
-                                                        );
-                                                        startPolling();
-                                                    }}
-                                                />
-                                            ))}
+                                <span className="flex-1 mr-2 overflow-x-auto whitespace-nowrap dark:text-white">
+                                    <div className="flex items-center flex-r">
+                                        <Globe className="mr-2 h-4 w-4" />
+                                        <a
+                                            href={website}
+                                            target="_blank"
+                                            rel="noopener noreferrer"
+                                            className="underline"
+                                        >
+                                            {website}
+                                        </a>
                                     </div>
+                                </span>
+                                <Button
+                                    variant="ghost"
+                                    onClick={() => handleRemoveWebsite(index)}
+                                >
+                                    <Trash className="h-4 w-4 dark:text-white" />
+                                </Button>
+                                {showTable[index] ? (
+                                    <ChevronUp className="h-4 w-4" />
+                                ) : (
+                                    <ChevronDown className="h-4 w-4" />
                                 )}
-                            </ScrollArea>
-                        ))}
-                    </div>
-                </ScrollArea>
+                            </div>
+                            {showTable[index] && (
+                                <div className="flex flex-col gap-2">
+                                    {files
+                                        .filter((item) => {
+                                            return (
+                                                knowledgeSource?.syncDetails
+                                                    ?.websiteCrawlingState
+                                                    ?.pages?.[item.url!]
+                                                    ?.parentURL === website
+                                            );
+                                        })
+                                        .sort((a, b) =>
+                                            a.url!.localeCompare(b.url!)
+                                        )
+                                        .map((item) => (
+                                            <RemoteFileItemChip
+                                                key={item.fileName}
+                                                file={item}
+                                                fileName={item.fileName}
+                                                knowledgeSourceType={
+                                                    RemoteKnowledgeSourceType.Website
+                                                }
+                                                approveFile={async (
+                                                    file,
+                                                    approved
+                                                ) => {
+                                                    await KnowledgeService.approveFile(
+                                                        agentId,
+                                                        file.id,
+                                                        approved
+                                                    );
+                                                    startPolling();
+                                                }}
+                                                reingestFile={(file) => {
+                                                    KnowledgeService.reingestFile(
+                                                        file.agentID,
+                                                        file.knowledgeSourceID,
+                                                        file.id
+                                                    );
+                                                    startPolling();
+                                                }}
+                                            />
+                                        ))}
+                                </div>
+                            )}
+                        </ScrollArea>
+                    ))}
+                </div>
 
                 {files?.some((item) => item.approved) && (
                     <IngestionStatusComponent files={files} />