diff --git a/react/src/components/ComputeSessionNodeItems/ContainerLogModal.tsx b/react/src/components/ComputeSessionNodeItems/ContainerLogModal.tsx
index 6f1e010c20..b8a1b2cda0 100644
--- a/react/src/components/ComputeSessionNodeItems/ContainerLogModal.tsx
+++ b/react/src/components/ComputeSessionNodeItems/ContainerLogModal.tsx
@@ -1,6 +1,7 @@
 import { downloadBlob } from '../../helper/csv-util';
 import { useSuspendedBackendaiClient } from '../../hooks';
 import { useTanQuery } from '../../hooks/reactQueryAlias';
+import { useMemoWithPrevious } from '../../hooks/useMemoWithPrevious';
 import BAIModal, { BAIModalProps } from '../BAIModal';
 import Flex from '../Flex';
 import { ContainerLogModalFragment$key } from './__generated__/ContainerLogModalFragment.graphql';
@@ -18,7 +19,7 @@ import {
 import graphql from 'babel-plugin-relay/macro';
 import _ from 'lodash';
 import { DownloadIcon } from 'lucide-react';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useFragment } from 'react-relay';
 
@@ -112,15 +113,11 @@ const ContainerLogModal: React.FC<ContainerLogModalProps> = ({
   // console.log(signed)
   // console.log(signed.uri);
 
-  const previousLastLineNumber = useRef(0);
-
-  useEffect(() => {
-    previousLastLineNumber.current = logs?.split('\n').length || 0;
-  }, [logs]);
+  const [lastLineNumbers, { resetPrevious: resetPreviousLineNumber }] =
+    useMemoWithPrevious(() => logs?.split('\n').length || 0, [logs]);
 
   const { md } = Grid.useBreakpoint();
   const { t } = useTranslation();
-  const fixedPreviousLastLineNumber = previousLastLineNumber.current;
 
   return (
     <BAIModal
@@ -170,7 +167,7 @@ const ContainerLogModal: React.FC<ContainerLogModalProps> = ({
             value={selectedKernelId}
             onChange={(value) => {
               setSelectedKernelId(value);
-              previousLastLineNumber.current = 0; // reset previous last line number
+              resetPreviousLineNumber();
             }}
             options={_.chain(session?.kernel_nodes?.edges)
               .map((e) => {
@@ -199,7 +196,7 @@ const ContainerLogModal: React.FC<ContainerLogModalProps> = ({
             onChange={(value) => { 
               setLogSize(value);
               if(value!=='full'){
-                previousLastLineNumber.current = 0; // reset previous last line number
+                resetPreviousLineNumber();
               }
               refetch();
             }}
@@ -248,7 +245,7 @@ const ContainerLogModal: React.FC<ContainerLogModalProps> = ({
                 enableSearchNavigation
                 selectableLines
                 text={logs || ''}
-                highlight={fixedPreviousLastLineNumber}
+                highlight={lastLineNumbers.previous}
                 extraLines={1}
                 // url={signed.uri}
                 // fetchOptions={
diff --git a/react/src/hooks/useMemoWithPrevious.tsx b/react/src/hooks/useMemoWithPrevious.tsx
new file mode 100644
index 0000000000..e8edda3561
--- /dev/null
+++ b/react/src/hooks/useMemoWithPrevious.tsx
@@ -0,0 +1,36 @@
+import { DependencyList, useEffect, useMemo, useRef, useState } from 'react';
+
+export const useMemoWithPrevious = <T,>(
+  factory: () => T,
+  deps: DependencyList,
+  { initialPrev }: { initialPrev?: T } | undefined = {},
+) => {
+  const prevRef = useRef(initialPrev);
+  const [prevResetKey, setPrevResetKey] = useState({});
+
+  const current = useMemo(factory, deps);
+  const memoizedPrev = useMemo(() => {
+    return prevRef.current;
+    // Only update when the reset key changes and deps change
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [...deps, prevResetKey]);
+
+  useEffect(() => {
+    prevRef.current = current;
+    // Only update when deps change
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, deps);
+
+  return [
+    {
+      previous: memoizedPrev,
+      current: current,
+    },
+    {
+      resetPrevious: () => {
+        prevRef.current = initialPrev;
+        setPrevResetKey({});
+      },
+    },
+  ] as const;
+};