diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
index 13d198de4675..4cd8cd20ed5f 100644
--- a/src/components/Image/index.tsx
+++ b/src/components/Image/index.tsx
@@ -12,7 +12,6 @@ function Image({source: propsSource, isAuthTokenRequired = false, onLoad, object
     const [aspectRatio, setAspectRatio] = useState<string | number | null>(null);
     const isObjectPositionTop = objectPosition === CONST.IMAGE_OBJECT_POSITION.TOP;
     const session = useSession();
-    let displayActivityIndicator = false;
 
     const {shouldSetAspectRatioInStyle} = useContext(ImageBehaviorContext);
 
@@ -71,11 +70,12 @@ function Image({source: propsSource, isAuthTokenRequired = false, onLoad, object
             return session.creationDate;
         }
         return undefined;
-    }, [session]);
+    }, [session, isAuthTokenRequired, isAcceptedSession]);
     useEffect(() => {
         if (isAuthTokenRequired) {
             previousSessionAge.current = validSessionAge;
         }
+        return;
     });
 
     /**
@@ -103,7 +103,6 @@ function Image({source: propsSource, isAuthTokenRequired = false, onLoad, object
                 if (session) {
                     activateReauthenticator(session);
                 }
-                displayActivityIndicator = true;
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return undefined;
             }
@@ -120,7 +119,7 @@ function Image({source: propsSource, isAuthTokenRequired = false, onLoad, object
      */
     const shouldOpacityBeZero = isObjectPositionTop && !aspectRatio;
 
-    return displayActivityIndicator ? (
+    return source === undefined ? (
         <FullScreenLoadingIndicator />
     ) : (
         <BaseImage
diff --git a/src/components/Image/types.ts b/src/components/Image/types.ts
index 82d164ad1634..f77274c49a54 100644
--- a/src/components/Image/types.ts
+++ b/src/components/Image/types.ts
@@ -1,9 +1,7 @@
 import type {ImageSource} from 'expo-image';
 import type {ImageRequireSource, ImageResizeMode, ImageStyle, ImageURISource, StyleProp} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
-import type {Session} from '@src/types/onyx';
 
 type ExpoImageSource = ImageSource | number | ImageSource[];
 
diff --git a/src/libs/actions/Session/Reauthenticator.ts b/src/libs/actions/Session/Reauthenticator.ts
index d79e4501d666..81bda13b71ff 100644
--- a/src/libs/actions/Session/Reauthenticator.ts
+++ b/src/libs/actions/Session/Reauthenticator.ts
@@ -29,6 +29,7 @@ Onyx.connect({
                 deactivate();
             }
         }
+        return;
     },
 });
 
@@ -61,8 +62,8 @@ function activate(session: Session) {
 function tryReauthenticate() {
     if (!isOffline && active) {
         reauthenticate();
-        return;
     }
+    return;
 }
 
 export {activate};