diff --git a/components/shared/LogoWithFallback.tsx b/components/shared/LogoWithFallback.tsx
new file mode 100644
index 00000000..83e88c5f
--- /dev/null
+++ b/components/shared/LogoWithFallback.tsx
@@ -0,0 +1,40 @@
+import Image from 'next/image'
+import { ReactElement, useEffect, useState } from 'react'
+
+const LogoWithFallback = ({
+  fallback,
+  alt,
+  src,
+  ...props
+}: {
+  fallback: ReactElement
+  alt: string
+  src: string
+  [x: string]: string | boolean | ReactElement
+}) => {
+  const [error, setError] = useState(false)
+
+  useEffect(() => {
+    setError(false)
+  }, [src])
+
+  return (
+    <>
+      {!error ? (
+        <Image
+          alt={alt}
+          onError={(e) => {
+            console.error('error', e)
+            setError(true)
+          }}
+          src={src}
+          {...props}
+        />
+      ) : (
+        fallback
+      )}
+    </>
+  )
+}
+
+export default LogoWithFallback
diff --git a/components/trade/MarketLogos.tsx b/components/trade/MarketLogos.tsx
index 2479fe51..0e0362b1 100644
--- a/components/trade/MarketLogos.tsx
+++ b/components/trade/MarketLogos.tsx
@@ -4,6 +4,7 @@ import { QuestionMarkCircleIcon } from '@heroicons/react/20/solid'
 import Image from 'next/legacy/image'
 import { useMemo } from 'react'
 import useMangoGroup from 'hooks/useMangoGroup'
+import LogoWithFallback from '@components/shared/LogoWithFallback'
 
 const MarketLogos = ({
   market,
@@ -40,6 +41,7 @@ const MarketLogos = ({
     return {
       baseLogoURI,
       quoteLogoURI,
+      name: market.name.split(/-|\//)[0],
     }
   }, [group, mangoTokens, market])
 
@@ -56,19 +58,14 @@ const MarketLogos = ({
       }`}
     >
       <div className="absolute left-0 top-0">
-        {logos.baseLogoURI ? (
-          <Image
-            alt=""
-            className="z-10 drop-shadow-md"
-            width={small ? '16' : '20'}
-            height={small ? '16' : '20'}
-            src={logos.baseLogoURI}
-          />
-        ) : (
-          <QuestionMarkCircleIcon
-            className={`${small ? 'h-4 w-4' : 'h-5 w-5'} text-th-fgd-3`}
-          />
-        )}
+        <LogoWithFallback
+          alt=""
+          className="z-10 drop-shadow-md"
+          width={small ? '16' : '20'}
+          height={small ? '16' : '20'}
+          src={logos.baseLogoURI}
+          fallback={<div></div>}
+        />
       </div>
       <div className="absolute right-0 top-0">
         {logos.quoteLogoURI && market instanceof Serum3Market ? (
diff --git a/public/icons/logo.png b/public/logos/logo.png
similarity index 100%
rename from public/icons/logo.png
rename to public/logos/logo.png
diff --git a/public/icons/logo.svg b/public/logos/logo.svg
similarity index 100%
rename from public/icons/logo.svg
rename to public/logos/logo.svg