diff --git a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
index fc5907f7a2..eb46edab94 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
@@ -156,13 +156,22 @@ export function getEndpointTypes() {
 }
 
 export function getEndpointType(type: string, subType: string): EndpointTypeConfig {
-  return getEndpointTypeByKey(createEndpointKey(type, subType));
+  return getEndpointTypeByKey(createEndpointKey(type, subType)) || getDefaultEndpointTypeConfig(type, subType);
 }
 
 function getEndpointTypeByKey(key: string): EndpointTypeConfig {
   return endpointTypesMap[key];
 }
 
+function getDefaultEndpointTypeConfig(type: string, subType?: string): EndpointTypeConfig {
+  return {
+    label: 'Unknown',
+    type,
+    subType,
+    doesNotSupportConnect: true
+  };
+}
+
 export function getIconForEndpoint(type: string, subType: string): EndpointIcon {
   const icon = {
     name: 'settings_ethernet',