diff --git a/client/src/components/Endpoints/Icon.tsx b/client/src/components/Endpoints/Icon.tsx
index 8065228736..f2627a97ba 100644
--- a/client/src/components/Endpoints/Icon.tsx
+++ b/client/src/components/Endpoints/Icon.tsx
@@ -77,7 +77,8 @@ const Icon: React.FC<IconProps> = (props) => {
       default: { icon: <GPTIcon size={size * 0.7} />, bg: 'grey', name: 'UNKNOWN' },
     };
 
-    const { icon, bg, name } = endpointIcons[endpoint ?? 'default'];
+    const { icon, bg, name } =
+      endpoint && endpointIcons[endpoint] ? endpointIcons[endpoint] : endpointIcons.default;
 
     return (
       <div
diff --git a/client/src/components/Endpoints/MinimalIcon.tsx b/client/src/components/Endpoints/MinimalIcon.tsx
index 2d25c5fd29..d0a55ee08d 100644
--- a/client/src/components/Endpoints/MinimalIcon.tsx
+++ b/client/src/components/Endpoints/MinimalIcon.tsx
@@ -31,7 +31,7 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
     default: { icon: <OpenAIMinimalIcon />, name: 'UNKNOWN' },
   };
 
-  const { icon, name } = endpointIcons[endpoint];
+  const { icon, name } = endpointIcons[endpoint] ?? endpointIcons.default;
 
   return (
     <div