diff --git a/web/src/lib/components/shared-components/UserAvatar.svelte b/web/src/lib/components/shared-components/UserAvatar.svelte
index 0791df13d0..7b63b8309d 100644
--- a/web/src/lib/components/shared-components/UserAvatar.svelte
+++ b/web/src/lib/components/shared-components/UserAvatar.svelte
@@ -11,7 +11,7 @@
     id: string;
     name: string;
     email: string;
-    profileImagePath: string;
+    profileImagePath: string | null;
     avatarColor: UserAvatarColor;
     profileChangedAt: string;
   }
diff --git a/web/src/lib/components/user-settings-page/DeviceCard.svelte b/web/src/lib/components/user-settings-page/DeviceCard.svelte
index 49928ab383..70aa96c58d 100644
--- a/web/src/lib/components/user-settings-page/DeviceCard.svelte
+++ b/web/src/lib/components/user-settings-page/DeviceCard.svelte
@@ -36,9 +36,9 @@
       <Icon icon={mdiAndroid} size="40" />
     {:else if session.deviceOS === 'iOS' || session.deviceOS === 'macOS'}
       <Icon icon={mdiApple} size="40" />
-    {:else if session.deviceOS.includes('Safari')}
+    {:else if session.deviceOS?.includes('Safari')}
       <Icon icon={mdiAppleSafari} size="40" />
-    {:else if session.deviceOS.includes('Windows')}
+    {:else if session.deviceOS?.includes('Windows')}
       <Icon icon={mdiMicrosoftWindows} size="40" />
     {:else if session.deviceOS === 'Linux'}
       <Icon icon={mdiLinux} size="40" />
diff --git a/web/src/lib/modals/AvatarEditModal.svelte b/web/src/lib/modals/AvatarEditModal.svelte
index 5582c4bc14..cb0e1f875f 100644
--- a/web/src/lib/modals/AvatarEditModal.svelte
+++ b/web/src/lib/modals/AvatarEditModal.svelte
@@ -16,7 +16,7 @@
 
   const onSave = async (color: UserAvatarColor) => {
     try {
-      if (authManager.user.profileImagePath !== '') {
+      if (authManager.user.profileImagePath) {
         await deleteProfileImage();
       }
 
@@ -38,7 +38,7 @@
         <button type="button" onclick={() => onSave(color)}>
           <UserAvatar
             label={color}
-            user={{ ...authManager.user, profileImagePath: '', avatarColor: color }}
+            user={{ ...authManager.user, profileImagePath: null, avatarColor: color }}
             size="xl"
           />
         </button>
diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
index e7a18f1d0f..edc441555e 100644
--- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -201,7 +201,7 @@
       personIds.map(async (personId) => {
         const person = await getPerson({ id: personId });
 
-        if (person.name == '') {
+        if (!person.name) {
           return $t('no_name');
         }