diff --git a/src/lib/components/chat/Messages/ProfileImage.svelte b/src/lib/components/chat/Messages/ProfileImage.svelte
index 46f071533..c5897b359 100644
--- a/src/lib/components/chat/Messages/ProfileImage.svelte
+++ b/src/lib/components/chat/Messages/ProfileImage.svelte
@@ -1,11 +1,16 @@
 <script lang="ts">
+	import { WEBUI_BASE_URL } from '$lib/constants';
 	export let src = '/user.png';
 </script>
 
 <div class=" mr-3">
 	<img
 		crossorigin="anonymous"
-		{src}
+		src={src.startsWith(WEBUI_BASE_URL) ||
+		src.startsWith('https://www.gravatar.com/avatar/') ||
+		src.startsWith('data:')
+			? src
+			: `/user.png`}
 		class=" w-8 object-cover rounded-full"
 		alt="profile"
 		draggable="false"
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte
index be6691244..449b69eb2 100644
--- a/src/routes/(app)/admin/+page.svelte
+++ b/src/routes/(app)/admin/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { WEBUI_API_BASE_URL } from '$lib/constants';
+	import { WEBUI_BASE_URL } from '$lib/constants';
 	import { WEBUI_NAME, config, user, showSidebar } from '$lib/stores';
 	import { goto } from '$app/navigation';
 	import { onMount, getContext } from 'svelte';
@@ -264,7 +264,11 @@
 									<div class="flex flex-row w-max">
 										<img
 											class=" rounded-full w-6 h-6 object-cover mr-2.5"
-											src={user.profile_image_url}
+											src={user.profile_image_url.startsWith(WEBUI_BASE_URL) ||
+											user.profile_image_url.startsWith('https://www.gravatar.com/avatar/') ||
+											user.profile_image_url.startsWith('data:')
+												? user.profile_image_url
+												: `/user.png`}
 											alt="user"
 										/>