diff --git a/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx b/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx
index 02686d566..11e3868cd 100644
--- a/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx
@@ -19,7 +19,7 @@ export type Props = {
   loadRecentMediaItems: (id: string, limit: number) => void;
   showAllMedia: () => void;
   showLightboxWithMedia: (
-    selectedAttachmentPath: string | undefined,
+    selectedIndex: number,
     media: ReadonlyArray<ReadonlyDeep<MediaItemType>>
   ) => void;
 };
@@ -66,9 +66,7 @@ export function ConversationDetailsMediaList({
             key={`${mediaItem.message.id}-${mediaItem.index}`}
             mediaItem={mediaItem}
             i18n={i18n}
-            onClick={() =>
-              showLightboxWithMedia(mediaItem.attachment.path, mediaItems)
-            }
+            onClick={() => showLightboxWithMedia(mediaItem.index, mediaItems)}
           />
         ))}
       </div>
diff --git a/ts/components/conversation/media-gallery/AttachmentSection.tsx b/ts/components/conversation/media-gallery/AttachmentSection.tsx
index b5f181016..22c3de1c4 100644
--- a/ts/components/conversation/media-gallery/AttachmentSection.tsx
+++ b/ts/components/conversation/media-gallery/AttachmentSection.tsx
@@ -35,7 +35,7 @@ export function AttachmentSection({
           const { message, index, attachment } = mediaItem;
 
           const onClick = () => {
-            onItemClick({ type, message, attachment });
+            onItemClick({ type, message, attachment, index: mediaItem.index });
           };
 
           switch (type) {
diff --git a/ts/components/conversation/media-gallery/MediaGallery.tsx b/ts/components/conversation/media-gallery/MediaGallery.tsx
index 15bf8e325..6b5565bf5 100644
--- a/ts/components/conversation/media-gallery/MediaGallery.tsx
+++ b/ts/components/conversation/media-gallery/MediaGallery.tsx
@@ -29,7 +29,7 @@ export type Props = {
   media: Array<MediaItemType>;
   saveAttachment: SaveAttachmentActionCreatorType;
   showLightboxWithMedia: (
-    selectedAttachmentPath: string | undefined,
+    selectedIndex: number,
     media: Array<MediaItemType>
   ) => void;
 };
@@ -106,7 +106,7 @@ function MediaSection({
             }
 
             case 'media': {
-              showLightboxWithMedia(event.attachment.path, media);
+              showLightboxWithMedia(event.index, media);
               break;
             }
 
diff --git a/ts/components/conversation/media-gallery/types/ItemClickEvent.ts b/ts/components/conversation/media-gallery/types/ItemClickEvent.ts
index 960b4502d..553d3f229 100644
--- a/ts/components/conversation/media-gallery/types/ItemClickEvent.ts
+++ b/ts/components/conversation/media-gallery/types/ItemClickEvent.ts
@@ -7,5 +7,6 @@ import type { AttachmentType } from '../../../../types/Attachment';
 export type ItemClickEvent = {
   message: Pick<MessageAttributesType, 'sent_at'>;
   attachment: AttachmentType;
+  index: number;
   type: 'media' | 'documents';
 };
diff --git a/ts/state/ducks/lightbox.ts b/ts/state/ducks/lightbox.ts
index 08ec718c3..719db3575 100644
--- a/ts/state/ducks/lightbox.ts
+++ b/ts/state/ducks/lightbox.ts
@@ -48,12 +48,12 @@ export type LightboxStateType =
       media: ReadonlyArray<ReadonlyDeep<MediaItemType>>;
       hasPrevMessage: boolean;
       hasNextMessage: boolean;
-      selectedAttachmentPath: string | undefined;
+      selectedIndex: number | undefined;
     };
 
 const CLOSE_LIGHTBOX = 'lightbox/CLOSE';
 const SHOW_LIGHTBOX = 'lightbox/SHOW';
-const SET_SELECTED_LIGHTBOX_PATH = 'lightbox/SET_SELECTED_LIGHTBOX_PATH';
+const SET_SELECTED_LIGHTBOX_INDEX = 'lightbox/SET_SELECTED_LIGHTBOX_INDEX';
 
 type CloseLightboxActionType = ReadonlyDeep<{
   type: typeof CLOSE_LIGHTBOX;
@@ -67,13 +67,13 @@ type ShowLightboxActionType = {
     media: ReadonlyArray<ReadonlyDeep<MediaItemType>>;
     hasPrevMessage: boolean;
     hasNextMessage: boolean;
-    selectedAttachmentPath: string | undefined;
+    selectedIndex: number | undefined;
   };
 };
 
-type SetSelectedLightboxPathActionType = ReadonlyDeep<{
-  type: typeof SET_SELECTED_LIGHTBOX_PATH;
-  payload: string | undefined;
+type SetSelectedLightboxIndexActionType = ReadonlyDeep<{
+  type: typeof SET_SELECTED_LIGHTBOX_INDEX;
+  payload: number;
 }>;
 
 // eslint-disable-next-line local-rules/type-alias-readonlydeep
@@ -83,7 +83,7 @@ type LightboxActionType =
   | MessageDeletedActionType
   | MessageExpiredActionType
   | ShowLightboxActionType
-  | SetSelectedLightboxPathActionType;
+  | SetSelectedLightboxIndexActionType;
 
 function closeLightbox(): ThunkAction<
   void,
@@ -116,7 +116,7 @@ function closeLightbox(): ThunkAction<
 }
 
 function showLightboxWithMedia(
-  selectedAttachmentPath: string | undefined,
+  selectedIndex: number | undefined,
   media: ReadonlyArray<ReadonlyDeep<MediaItemType>>
 ): ShowLightboxActionType {
   return {
@@ -124,7 +124,7 @@ function showLightboxWithMedia(
     payload: {
       isViewOnce: false,
       media,
-      selectedAttachmentPath,
+      selectedIndex,
       hasPrevMessage: false,
       hasNextMessage: false,
     },
@@ -202,7 +202,7 @@ function showLightboxForViewOnceMedia(
       payload: {
         isViewOnce: true,
         media,
-        selectedAttachmentPath: undefined,
+        selectedIndex: undefined,
         hasPrevMessage: false,
         hasNextMessage: false,
       },
@@ -335,7 +335,7 @@ function showLightbox(opts: {
       payload: {
         isViewOnce: false,
         media,
-        selectedAttachmentPath: attachment.path,
+        selectedIndex: media.findIndex(({ path }) => path === attachment.path),
         hasPrevMessage:
           older.length > 0 && filterValidAttachments(older[0]).length > 0,
         hasNextMessage:
@@ -464,12 +464,12 @@ function showLightboxForPrevMessage(): ThunkAction<
   return showLightboxForAdjacentMessage(AdjacentMessageDirection.Previous);
 }
 
-function setSelectedLightboxPath(
-  path: string | undefined
-): SetSelectedLightboxPathActionType {
+function setSelectedLightboxIndex(
+  index: number
+): SetSelectedLightboxIndexActionType {
   return {
-    type: SET_SELECTED_LIGHTBOX_PATH,
-    payload: path,
+    type: SET_SELECTED_LIGHTBOX_INDEX,
+    payload: index,
   };
 }
 
@@ -480,7 +480,7 @@ export const actions = {
   showLightboxWithMedia,
   showLightboxForPrevMessage,
   showLightboxForNextMessage,
-  setSelectedLightboxPath,
+  setSelectedLightboxIndex,
 };
 
 export const useLightboxActions = (): BoundActionCreatorsMapObject<
@@ -508,14 +508,17 @@ export function reducer(
     };
   }
 
-  if (action.type === SET_SELECTED_LIGHTBOX_PATH) {
+  if (action.type === SET_SELECTED_LIGHTBOX_INDEX) {
     if (!state.isShowingLightbox) {
       return state;
     }
 
     return {
       ...state,
-      selectedAttachmentPath: action.payload,
+      selectedIndex: Math.max(
+        0,
+        Math.min(state.media.length - 1, action.payload)
+      ),
     };
   }
 
diff --git a/ts/state/selectors/lightbox.ts b/ts/state/selectors/lightbox.ts
index 189e39e3f..96e981708 100644
--- a/ts/state/selectors/lightbox.ts
+++ b/ts/state/selectors/lightbox.ts
@@ -27,11 +27,7 @@ export const getSelectedIndex = createSelector(
       return 0;
     }
 
-    const index = state.media.findIndex(
-      item => item.attachment.path === state.selectedAttachmentPath
-    );
-
-    return index > 0 ? index : 0;
+    return state.selectedIndex ?? 0;
   }
 );
 
diff --git a/ts/state/smart/Lightbox.tsx b/ts/state/smart/Lightbox.tsx
index 7eff1b038..89f44da33 100644
--- a/ts/state/smart/Lightbox.tsx
+++ b/ts/state/smart/Lightbox.tsx
@@ -32,7 +32,7 @@ export function SmartLightbox(): JSX.Element | null {
     closeLightbox,
     showLightboxForNextMessage,
     showLightboxForPrevMessage,
-    setSelectedLightboxPath,
+    setSelectedLightboxIndex,
   } = useLightboxActions();
   const { toggleForwardMessagesModal } = useGlobalModalActions();
   const { pauseVoiceNotePlayer } = useAudioPlayerActions();
@@ -58,12 +58,11 @@ export function SmartLightbox(): JSX.Element | null {
       }
       return;
     }
-    setSelectedLightboxPath(media[selectedIndex - 1]?.attachment.path);
+    setSelectedLightboxIndex(selectedIndex - 1);
   }, [
     showLightboxForPrevMessage,
-    media,
     selectedIndex,
-    setSelectedLightboxPath,
+    setSelectedLightboxIndex,
     hasPrevMessage,
   ]);
 
@@ -74,22 +73,15 @@ export function SmartLightbox(): JSX.Element | null {
       }
       return;
     }
-    setSelectedLightboxPath(media[selectedIndex + 1]?.attachment.path);
+    setSelectedLightboxIndex(selectedIndex + 1);
   }, [
     showLightboxForNextMessage,
     media,
     selectedIndex,
-    setSelectedLightboxPath,
+    setSelectedLightboxIndex,
     hasNextMessage,
   ]);
 
-  const onSelectAttachment = useCallback(
-    (newIndex: number) => {
-      setSelectedLightboxPath(media[newIndex]?.attachment.path);
-    },
-    [setSelectedLightboxPath, media]
-  );
-
   if (!isShowingLightbox) {
     return null;
   }
@@ -107,7 +99,7 @@ export function SmartLightbox(): JSX.Element | null {
       onMediaPlaybackStart={pauseVoiceNotePlayer}
       onPrevAttachment={onPrevAttachment}
       onNextAttachment={onNextAttachment}
-      onSelectAttachment={onSelectAttachment}
+      onSelectAttachment={setSelectedLightboxIndex}
       hasNextMessage={hasNextMessage}
       hasPrevMessage={hasPrevMessage}
     />