diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 47d45fa316d..0af1e835b0d 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -48,6 +48,7 @@ import {
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
 import { useDebounce } from "../debounce";
 import { isVideo } from "src/utils/visualFile";
+import { imageTitle } from "src/core/files";
 
 const CLASSNAME = "Lightbox";
 const CLASSNAME_HEADER = `${CLASSNAME}-header`;
@@ -689,6 +690,7 @@ export const LightboxComponent: React.FC<IProps> = ({
     }
 
     const currentImage: ILightboxImage | undefined = images[currentIndex];
+    const title = currentImage ? imageTitle(currentImage) : undefined;
 
     function setRating(v: number | null) {
       if (currentImage?.id) {
@@ -932,9 +934,9 @@ export const LightboxComponent: React.FC<IProps> = ({
             )}
           </div>
           <div>
-            {currentImage?.title && (
+            {currentImage && (
               <Link to={`/images/${currentImage.id}`} onClick={() => close()}>
-                {currentImage.title ?? ""}
+                {title ?? ""}
               </Link>
             )}
           </div>
diff --git a/ui/v2.5/src/hooks/Lightbox/types.ts b/ui/v2.5/src/hooks/Lightbox/types.ts
index e98fb48f4db..56c9d6b7116 100644
--- a/ui/v2.5/src/hooks/Lightbox/types.ts
+++ b/ui/v2.5/src/hooks/Lightbox/types.ts
@@ -8,6 +8,7 @@ interface IImagePaths {
 
 interface IFiles {
   __typename?: string;
+  path: string;
   width: number;
   height: number;
   video_codec?: GQL.Maybe<string>;
@@ -19,7 +20,7 @@ export interface ILightboxImage {
   rating100?: GQL.Maybe<number>;
   o_counter?: GQL.Maybe<number>;
   paths: IImagePaths;
-  visual_files?: GQL.Maybe<IFiles>[];
+  visual_files?: IFiles[];
 }
 
 export interface IChapter {