diff --git a/client/providers/AvatarUrlProvider.js b/client/providers/AvatarUrlProvider.js
index a23b49dd333f..471d677e63ee 100644
--- a/client/providers/AvatarUrlProvider.js
+++ b/client/providers/AvatarUrlProvider.js
@@ -9,6 +9,6 @@ export function AvatarUrlProvider({ children }) {
 	const cdn = useSetting('CDN_PREFIX_ALL');
 	const cdnPrefix = useSetting('CDN_PREFIX');
 
-	const avatarBase = useMemo(() => ({ baseUrl: `${ cdn && cdnPrefix }${ base }` }), [cdn, cdnPrefix]);
+	const avatarBase = useMemo(() => ({ baseUrl: `${ (cdn && cdnPrefix) || '' }${ base }` }), [cdn, cdnPrefix]);
 	return <Avatar.Context.Provider children={children} value={avatarBase} />;
 }