diff --git a/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx b/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx
index 9a22a69b..903d4035 100644
--- a/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx
+++ b/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx
@@ -71,7 +71,7 @@ export default function Export3Details({ export3 }: { export3: Export3 }) {
const folderRows = Object.entries(export3.folders).map(([id, folder]) => (
{folder.name}
- {findUser(export3, folder.user)?.username ?? 'unknown'}
+ {findUser(export3, folder?.user)?.username ?? 'unknown'}
{folder.public ? : }
{new Date(folder.created_at).toLocaleString()}
{findFilesByUser(export3, id).length}
diff --git a/src/lib/import/version3/find.ts b/src/lib/import/version3/find.ts
index c7b5bd07..120d5c2f 100644
--- a/src/lib/import/version3/find.ts
+++ b/src/lib/import/version3/find.ts
@@ -1,6 +1,8 @@
import { Export3 } from './validateExport';
-export function findUser(export3: Export3, id: string) {
+export function findUser(export3: Export3, id: string | undefined | null) {
+ if (!id) return null;
+
return export3.users[id];
}