diff --git a/src/client/components/SimpleVirtualList.tsx b/src/client/components/SimpleVirtualList.tsx
new file mode 100644
index 0000000..7768ed5
--- /dev/null
+++ b/src/client/components/SimpleVirtualList.tsx
@@ -0,0 +1,69 @@
+import { useWatch } from '@/hooks/useWatch';
+import { VirtualItem, useVirtualizer } from '@tanstack/react-virtual';
+import { Empty } from 'antd';
+import { last } from 'lodash-es';
+import React, { useRef } from 'react';
+
+interface VirtualListProps<T = any> {
+  allData: T[];
+  hasNextPage: boolean | undefined;
+  isFetchingNextPage: boolean;
+  onFetchNextPage: () => void;
+  estimateSize: (index: number) => number;
+  renderItem: (item: VirtualItem) => React.ReactElement;
+}
+export const SimpleVirtualList: React.FC<VirtualListProps> = React.memo(
+  (props) => {
+    const {
+      allData,
+      hasNextPage,
+      isFetchingNextPage,
+      onFetchNextPage,
+      estimateSize,
+      renderItem,
+    } = props;
+
+    const parentRef = useRef<HTMLDivElement>(null);
+
+    const rowVirtualizer = useVirtualizer({
+      count: hasNextPage ? allData.length + 1 : allData.length,
+      getScrollElement: () => parentRef.current,
+      estimateSize,
+      overscan: 5,
+    });
+
+    const virtualItems = rowVirtualizer.getVirtualItems();
+
+    useWatch([virtualItems], () => {
+      const lastItem = last(virtualItems);
+
+      if (!lastItem) {
+        return;
+      }
+
+      if (
+        lastItem.index >= allData.length - 1 &&
+        hasNextPage &&
+        !isFetchingNextPage
+      ) {
+        onFetchNextPage();
+      }
+    });
+
+    return (
+      <div ref={parentRef} className="h-full w-full overflow-auto">
+        {virtualItems.length === 0 && <Empty />}
+
+        <div
+          className="relative w-full"
+          style={{
+            height: `${rowVirtualizer.getTotalSize()}px`,
+          }}
+        >
+          {virtualItems.map((virtualItem) => renderItem(virtualItem))}
+        </div>
+      </div>
+    );
+  }
+);
+SimpleVirtualList.displayName = 'SimpleVirtualList';
diff --git a/src/client/routes/settings/auditLog.tsx b/src/client/routes/settings/auditLog.tsx
index 7e3e188..f9564ff 100644
--- a/src/client/routes/settings/auditLog.tsx
+++ b/src/client/routes/settings/auditLog.tsx
@@ -13,6 +13,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
 import { useWatch } from '@/hooks/useWatch';
 import dayjs from 'dayjs';
 import { ColorTag } from '@/components/ColorTag';
+import { SimpleVirtualList } from '@/components/SimpleVirtualList';
 
 export const Route = createFileRoute('/settings/auditLog')({
   beforeLoad: routeAuthBeforeLoad,
@@ -66,57 +67,53 @@ function PageComponent() {
     <CommonWrapper header={<CommonHeader title={t('Audit Log')} />}>
       <ScrollArea className="h-full overflow-hidden p-4">
         <List>
-          <div ref={parentRef} className="h-full w-full overflow-auto">
-            {virtualItems.length === 0 && <Empty />}
+          <SimpleVirtualList
+            allData={allData}
+            hasNextPage={hasNextPage}
+            isFetchingNextPage={isFetchingNextPage}
+            onFetchNextPage={fetchNextPage}
+            estimateSize={() => 48}
+            renderItem={(item) => {
+              const isLoaderRow = item.index > allData.length - 1;
+              const data = allData[item.index];
 
-            <div
-              className="relative w-full"
-              style={{
-                height: `${rowVirtualizer.getTotalSize()}px`,
-              }}
-            >
-              {virtualItems.map((virtualRow) => {
-                const isLoaderRow = virtualRow.index > allData.length - 1;
-                const item = allData[virtualRow.index];
-
-                return (
-                  <List.Item
-                    key={virtualRow.index}
-                    className="absolute left-0 top-0 w-full"
-                    style={{
-                      height: `${virtualRow.size}px`,
-                      transform: `translateY(${virtualRow.start}px)`,
-                    }}
-                  >
-                    {isLoaderRow ? (
-                      hasNextPage ? (
-                        t('Loading more...')
-                      ) : (
-                        t('Nothing more to load')
-                      )
+              return (
+                <List.Item
+                  key={item.index}
+                  className="absolute left-0 top-0 w-full"
+                  style={{
+                    height: `${item.size}px`,
+                    transform: `translateY(${item.start}px)`,
+                  }}
+                >
+                  {isLoaderRow ? (
+                    hasNextPage ? (
+                      t('Loading more...')
                     ) : (
-                      <div className="flex h-7 items-center overflow-hidden">
-                        {item.relatedType && (
-                          <ColorTag label={item.relatedType} />
+                      t('Nothing more to load')
+                    )
+                  ) : (
+                    <div className="flex h-7 items-center overflow-hidden">
+                      {data.relatedType && (
+                        <ColorTag label={data.relatedType} />
+                      )}
+                      <div
+                        className="mr-2 w-9 text-xs opacity-60"
+                        title={dayjs(data.createdAt).format(
+                          'YYYY-MM-DD HH:mm:ss'
                         )}
-                        <div
-                          className="mr-2 w-9 text-xs opacity-60"
-                          title={dayjs(item.createdAt).format(
-                            'YYYY-MM-DD HH:mm:ss'
-                          )}
-                        >
-                          {dayjs(item.createdAt).format('MM-DD HH:mm')}
-                        </div>
-                        <div className="h-full flex-1 overflow-auto">
-                          {item.content}
-                        </div>
+                      >
+                        {dayjs(data.createdAt).format('MM-DD HH:mm')}
                       </div>
-                    )}
-                  </List.Item>
-                );
-              })}
-            </div>
-          </div>
+                      <div className="h-full flex-1 overflow-auto">
+                        {data.content}
+                      </div>
+                    </div>
+                  )}
+                </List.Item>
+              );
+            }}
+          />
         </List>
       </ScrollArea>
     </CommonWrapper>