diff --git a/package-lock.json b/package-lock.json
index 614c4ddc..dee3d747 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@cloudquery/plugin-config-ui-lib",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@cloudquery/plugin-config-ui-lib",
-      "version": "6.0.1",
+      "version": "6.0.2",
       "license": "MPL-2.0",
       "dependencies": {
         "@babel/runtime": "^7.26.7",
diff --git a/package.json b/package.json
index c1109afc..d356cb2a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudquery/plugin-config-ui-lib",
   "description": "Plugin configuration UI library for CloudQuery Cloud App",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "private": false,
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
diff --git a/src/components/display/logo.tsx b/src/components/display/logo.tsx
index 3c46b1f9..0a364f2e 100644
--- a/src/components/display/logo.tsx
+++ b/src/components/display/logo.tsx
@@ -61,7 +61,7 @@ export function Logo({ width = 24, height = 24, src, alt, fallbackSrc }: LogoPro
         height={height - PADDING}
         width={width - PADDING}
         onLoad={() => setIsLoaded(true)}
-        onError={parseSrc(currentSrc) === src ? handleError : undefined}
+        onError={handleError}
       />
     </Box>
   );
diff --git a/src/components/display/serviceList.tsx b/src/components/display/serviceList.tsx
index 3e77d37b..3f8a8833 100644
--- a/src/components/display/serviceList.tsx
+++ b/src/components/display/serviceList.tsx
@@ -13,6 +13,7 @@ import Tooltip from '@mui/material/Tooltip';
 import Typography from '@mui/material/Typography';
 
 import { Logo } from './logo';
+import { parseSrc } from '../../utils/parseSrc';
 
 enum ServiceListMode {
   All = 'all',
@@ -56,7 +57,7 @@ export interface ServiceListProps {
 export function ServiceList({
   services,
   topServices = [],
-  fallbackLogoSrc = 'favicon.ico',
+  fallbackLogoSrc = parseSrc('favicon.ico'),
   value = [],
   onChange,
   maxHeight = '400px',
diff --git a/src/components/form/controls/controlServicesSelectorField.tsx b/src/components/form/controls/controlServicesSelectorField.tsx
index 594b70d6..80d0bc2e 100644
--- a/src/components/form/controls/controlServicesSelectorField.tsx
+++ b/src/components/form/controls/controlServicesSelectorField.tsx
@@ -6,6 +6,7 @@ import FormLabel from '@mui/material/FormLabel';
 
 import { Controller } from 'react-hook-form';
 
+import { usePluginContext } from '../../../context';
 import { getFieldHelperText } from '../../../utils';
 import { ServiceList, ServiceTypes } from '../../display';
 
@@ -33,6 +34,8 @@ export function ControlServicesSelectorField({
   helperText,
   label,
 }: ControlServicesSelectorFieldProps) {
+  const { config } = usePluginContext();
+
   return (
     <Controller
       name={name}
@@ -45,6 +48,7 @@ export function ControlServicesSelectorField({
             value={field.value}
             onChange={field.onChange}
             maxHeight="none"
+            fallbackLogoSrc={config.iconLink}
           />
           <FormHelperText error={!!fieldState.error?.message}>
             {getFieldHelperText(fieldState.error?.message, helperText)}
diff --git a/src/components/form/header.tsx b/src/components/form/header.tsx
index 400dd163..3d46eaa5 100644
--- a/src/components/form/header.tsx
+++ b/src/components/form/header.tsx
@@ -5,6 +5,7 @@ import { useFormContext } from 'react-hook-form';
 import { ControlTextField } from './controls/controlTextField';
 import { Section } from './sections/section';
 import { usePluginContext } from '../../context/plugin';
+import { parseSrc } from '../../utils/parseSrc';
 import { Logo } from '../display';
 
 /**
@@ -37,7 +38,7 @@ export function ConfigUIFormHeader() {
             gap: 1.5,
           }}
         >
-          <Logo src={config.iconLink} fallbackSrc="favicon.ico" alt={config.label} />
+          <Logo src={config.iconLink} fallbackSrc={parseSrc('favicon.ico')} alt={config.label} />
           <Typography variant="body1">{config.label}</Typography>
         </Box>
       </Box>