diff --git a/lib/src/Components/AppShell/UserControl.tsx b/lib/src/Components/AppShell/UserControl.tsx
index 2599708c..7c2902ae 100644
--- a/lib/src/Components/AppShell/UserControl.tsx
+++ b/lib/src/Components/AppShell/UserControl.tsx
@@ -42,6 +42,11 @@ export const UserControl = () => {
       pending: 'logging out ..',
     })
   }
+  const avatar: string | undefined =
+    userProfile.image && appState.assetsApi.url
+      ? appState.assetsApi.url + userProfile.image
+      : userProfile.image_external
+
   return (
     <>
       {isAuthenticated ? (
@@ -50,10 +55,10 @@ export const UserControl = () => {
             to={`${userProfile.id && '/item/' + userProfile.id}`}
             className='tw:flex tw:items-center'
           >
-            {userProfile.image && (
+            {avatar && (
               <div className='tw:avatar'>
                 <div className='tw:w-10 tw:rounded-full'>
-                  <img src={appState.assetsApi.url + userProfile.image} />
+                  <img src={avatar} alt='User avatar' />
                 </div>
               </div>
             )}
diff --git a/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx b/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
index 7a79481e..89ef9697 100644
--- a/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
+++ b/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
@@ -58,8 +58,8 @@ export function HeaderView({
   const [imageLoaded, setImageLoaded] = useState(false)
 
   const avatar =
-    item.image_external ||
-    (item.image && appState.assetsApi.url + item.image + '?width=160&heigth=160')
+    (item.image && appState.assetsApi.url + item.image + '?width=160&heigth=160') ||
+    item.image_external
   const title = item.name
   const subtitle = item.subname
 
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index b386c5b8..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "utopia-map",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "utopia-map"
-    }
-  }
-}