diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index 0c076b0b24..27a539fedb 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -32,6 +32,7 @@
   import ChangeLocation from '../shared-components/change-location.svelte';
   import { handleError } from '../../utils/handle-error';
   import { user } from '$lib/stores/user.store';
+  import { currentAsset } from '$lib/stores/assets.store';
 
   export let asset: AssetResponseDto;
   export let albums: AlbumResponseDto[] = [];
@@ -59,6 +60,7 @@
     // Get latest description from server
     if (asset.id && !api.isSharedLink) {
       api.assetApi.getAssetById({ id: asset.id }).then((res) => {
+        $currentAsset = res.data;
         people = res.data?.people?.people || [];
         textarea.value = res.data?.exifInfo?.description || '';
       });
@@ -637,8 +639,6 @@
 
 {#if showEditFaces}
   <PersonSidePanel
-    assetId={asset.id}
-    assetType={asset.type}
     on:close={() => {
       showEditFaces = false;
     }}
diff --git a/web/src/lib/components/faces-page/assign-face-side-panel.svelte b/web/src/lib/components/faces-page/assign-face-side-panel.svelte
index 3669fb1cc7..f1ec6ffe9f 100644
--- a/web/src/lib/components/faces-page/assign-face-side-panel.svelte
+++ b/web/src/lib/components/faces-page/assign-face-side-panel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { api, AssetTypeEnum, type AssetFaceResponseDto, type PersonResponseDto } from '@api';
+  import { api, type AssetFaceResponseDto, type PersonResponseDto } from '@api';
   import { createEventDispatcher } from 'svelte';
   import { linear } from 'svelte/easing';
   import { fly } from 'svelte/transition';
@@ -9,12 +9,10 @@
   import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
   import { getPersonNameWithHiddenValue, searchNameLocal, zoomImageToBase64 } from '$lib/utils/person';
   import { handleError } from '$lib/utils/handle-error';
-  import { photoViewer } from '$lib/stores/assets.store';
+  import { currentAsset, photoViewer } from '$lib/stores/assets.store';
 
   export let personWithFace: AssetFaceResponseDto;
   export let allPeople: PersonResponseDto[];
-  export let assetType: AssetTypeEnum;
-  export let assetId: string;
 
   // loading spinners
   let isShowLoadingNewPerson = false;
@@ -33,9 +31,13 @@
   };
 
   const handleCreatePerson = async () => {
+    if ($currentAsset === null) {
+      return;
+    }
+
     const timeout = setTimeout(() => (isShowLoadingNewPerson = true), 100);
 
-    const newFeaturePhoto = await zoomImageToBase64(personWithFace, $photoViewer, assetType, assetId);
+    const newFeaturePhoto = await zoomImageToBase64(personWithFace, $photoViewer, $currentAsset.type, $currentAsset.id);
 
     clearTimeout(timeout);
     isShowLoadingNewPerson = false;
diff --git a/web/src/lib/components/faces-page/person-side-panel.svelte b/web/src/lib/components/faces-page/person-side-panel.svelte
index ac895b4482..cf61f1913c 100644
--- a/web/src/lib/components/faces-page/person-side-panel.svelte
+++ b/web/src/lib/components/faces-page/person-side-panel.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { fly } from 'svelte/transition';
   import { linear } from 'svelte/easing';
-  import { api, type PersonResponseDto, AssetFaceResponseDto, AssetTypeEnum } from '@api';
+  import { api, type PersonResponseDto, AssetFaceResponseDto } from '@api';
   import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import { createEventDispatcher, onMount } from 'svelte';
@@ -13,13 +13,10 @@
   import { websocketStore } from '$lib/stores/websocket';
   import AssignFaceSidePanel from './assign-face-side-panel.svelte';
   import { getPersonNameWithHiddenValue, zoomImageToBase64 } from '$lib/utils/person';
-  import { photoViewer } from '$lib/stores/assets.store';
+  import { currentAsset, photoViewer } from '$lib/stores/assets.store';
   import UnassignedFacesSidePannel from './unassigned-faces-side-pannel.svelte';
   import type { FaceWithGeneretedThumbnail } from '$lib/utils/people-utils';
 
-  export let assetId: string;
-  export let assetType: AssetTypeEnum;
-
   // keep track of the changes
   let idsOfPersonToCreate: string[] = [];
   let idsOfAssetFaceGenerated: string[] = [];
@@ -74,21 +71,24 @@
   }
 
   onMount(async () => {
+    if ($currentAsset === null) {
+      return;
+    }
     const timeout = setTimeout(() => (isShowLoadingPeople = true), 100);
     try {
       const { data } = await api.personApi.getAllPeople({ withHidden: true });
       allPeople = data.people;
-      const result = await api.faceApi.getFaces({ id: assetId });
+      const result = await api.faceApi.getFaces({ id: $currentAsset.id });
       peopleWithFaces = result.data;
       selectedPersonToCreate = new Array<string | null>(peopleWithFaces.length);
       selectedPersonToReassign = new Array<PersonResponseDto | null>(peopleWithFaces.length);
       selectedPersonToRemove = new Array<boolean>(peopleWithFaces.length);
       unassignedFaces = await Promise.all(
         peopleWithFaces.map(async (personWithFace) => {
-          if (personWithFace.person) {
+          if (personWithFace.person || $currentAsset === null) {
             return null;
           } else {
-            const image = await zoomImageToBase64(personWithFace, $photoViewer);
+            const image = await zoomImageToBase64(personWithFace, $photoViewer, $currentAsset.type, $currentAsset.id);
             return image ? { ...personWithFace, customThumbnail: image } : null;
           }
         }),
@@ -156,10 +156,13 @@
   };
 
   const handleUnassignFaces = async () => {
+    if ($currentAsset === null) {
+      return;
+    }
     if (numberOfFacesToUnassign > 0) {
       for (let i = 0; i < peopleWithFaces.length; i++) {
         if (selectedPersonToRemove[i]) {
-          const image = await zoomImageToBase64(peopleWithFaces[i], $photoViewer);
+          const image = await zoomImageToBase64(peopleWithFaces[i], $photoViewer, $currentAsset.type, $currentAsset.id);
           if (image) {
             selectedPersonToUnassign.push({ ...peopleWithFaces[i], customThumbnail: image });
             // Trigger reactivity
@@ -537,8 +540,6 @@
   <AssignFaceSidePanel
     personWithFace={peopleWithFaces[editedPersonIndex]}
     {allPeople}
-    {assetType}
-    {assetId}
     on:close={() => (showSeletecFaces = false)}
     on:createPerson={(event) => handleCreatePerson(event.detail)}
     on:reassign={(event) => handleReassignFace(event.detail)}
diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts
index 7b1ff8f7a1..9e8295c52f 100644
--- a/web/src/lib/stores/assets.store.ts
+++ b/web/src/lib/stores/assets.store.ts
@@ -14,6 +14,8 @@ export enum BucketPosition {
 
 export type AssetStoreOptions = Omit<AssetApiGetTimeBucketsRequest, 'size'>;
 
+export const currentAsset = writable<AssetResponseDto | null>(null);
+
 export interface Viewport {
   width: number;
   height: number;