diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte
index 8ece061f57..688d7c5db9 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte
@@ -28,7 +28,7 @@
 
 {#if $selectedComponent}
   {#key $selectedComponent._id}
-    <Panel {title} icon={componentDefinition.icon} borderLeft>
+    <Panel {title} icon={componentDefinition?.icon} borderLeft>
       <ComponentSettingsSection
         {componentInstance}
         {componentDefinition}
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
index 8512a371d8..dbbfb70f17 100644
--- a/packages/client/src/stores/components.js
+++ b/packages/client/src/stores/components.js
@@ -144,7 +144,7 @@ const createComponentStore = () => {
     if (!Component || !schema?.schema?.name) {
       return
     }
-    const component = `plugin/${schema.schema.name}/${version}`
+    const component = `plugin/${schema.schema.name}`
     store.update(state => {
       state.customComponentManifest[component] = {
         Component,
diff --git a/packages/server/src/api/controllers/component.js b/packages/server/src/api/controllers/component.js
index 601f39db34..a0db34c9b8 100644
--- a/packages/server/src/api/controllers/component.js
+++ b/packages/server/src/api/controllers/component.js
@@ -46,7 +46,7 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
         .map(row => row.doc)
         .filter(plugin => plugin.schema.type === "component")
         .forEach(plugin => {
-          const fullComponentName = `plugin/${plugin.name}/${plugin.version}`
+          const fullComponentName = `plugin/${plugin.name}`
           definitions[fullComponentName] = {
             component: fullComponentName,
             ...plugin.schema.schema,