diff --git a/.changeset/quiet-cooks-visit.md b/.changeset/quiet-cooks-visit.md
new file mode 100644
index 00000000000..2f5941d422c
--- /dev/null
+++ b/.changeset/quiet-cooks-visit.md
@@ -0,0 +1,13 @@
+---
+"@builder.io/sdk": minor
+"@builder.io/sdk-angular": minor
+"@builder.io/sdk-react-nextjs": minor
+"@builder.io/sdk-qwik": minor
+"@builder.io/sdk-react": minor
+"@builder.io/sdk-react-native": minor
+"@builder.io/sdk-solid": minor
+"@builder.io/sdk-svelte": minor
+"@builder.io/sdk-vue": minor
+---
+
+componentInfos usage replaced with registeredComponents
diff --git a/packages/sdks/mitosis.config.cjs b/packages/sdks/mitosis.config.cjs
index 3a7c72e3d34..07c9a7fe072 100644
--- a/packages/sdks/mitosis.config.cjs
+++ b/packages/sdks/mitosis.config.cjs
@@ -738,10 +738,6 @@ module.exports = {
                         code: 'props.context.apiKey',
                         type: 'property',
                       },
-                      componentInfos: {
-                        code: 'props.context.componentInfos',
-                        type: 'property',
-                      },
                       inheritedStyles: {
                         code: 'props.context.inheritedStyles',
                         type: 'property',
diff --git a/packages/sdks/src/components/content/components/enable-editor.lite.tsx b/packages/sdks/src/components/content/components/enable-editor.lite.tsx
index 9c859dfd5eb..6a4daf187ec 100644
--- a/packages/sdks/src/components/content/components/enable-editor.lite.tsx
+++ b/packages/sdks/src/components/content/components/enable-editor.lite.tsx
@@ -14,7 +14,7 @@ import {
   useTarget,
 } from '@builder.io/mitosis';
 import builderContext from '../../../context/builder.context.lite.js';
-import type { BuilderContextInterface } from '../../../context/types.js';
+import type { BuilderContextInterface, RegisteredComponents } from '../../../context/types.js';
 import { evaluate } from '../../../functions/evaluate/index.js';
 import { fastClone } from '../../../functions/fast-clone.js';
 import { fetchOneEntry } from '../../../functions/get-content/index.js';
@@ -61,6 +61,7 @@ type BuilderEditorProps = Omit<
   | 'blocksWrapperProps'
   | 'linkComponent'
 > & {
+  registeredComponents: RegisteredComponents,
   builderContextSignal: Signal<BuilderContextInterface>;
   setBuilderContextSignal?: (signal: any) => any;
   children?: any;
@@ -365,9 +366,7 @@ export default function EnableEditor(props: BuilderEditorProps) {
         modelName: props.model ?? '',
         apiKey: props.apiKey,
       });
-      Object.values<ComponentInfo>(
-        props.builderContextSignal.value.componentInfos
-      ).forEach((registeredComponent) => {
+      Object.values<ComponentInfo>(props.registeredComponents).forEach((registeredComponent) => {
         if (
           !registeredComponent.models?.length ||
           registeredComponent.models.includes(props.model)
diff --git a/packages/sdks/src/components/content/content.lite.tsx b/packages/sdks/src/components/content/content.lite.tsx
index 81ef2c24817..4a66acc3821 100644
--- a/packages/sdks/src/components/content/content.lite.tsx
+++ b/packages/sdks/src/components/content/content.lite.tsx
@@ -18,8 +18,6 @@ import type {
 import { evaluate } from '../../functions/evaluate/evaluate.js';
 import { serializeIncludingFunctions } from '../../functions/register-component.js';
 import { logger } from '../../helpers/logger.js';
-import type { ComponentInfo } from '../../types/components.js';
-import type { Dictionary } from '../../types/typescript.js';
 import Blocks from '../blocks/blocks.lite.jsx';
 import { getUpdateVariantVisibilityScript } from '../content-variants/helpers.js';
 import DynamicDiv from '../dynamic-div.lite.jsx';
@@ -103,16 +101,6 @@ export default function ContentComponent(props: ContentProps) {
         canTrack: props.canTrack,
         apiKey: props.apiKey,
         apiVersion: props.apiVersion,
-        componentInfos: [
-          ...getDefaultRegisteredComponents(),
-          ...(props.customComponents || []),
-        ].reduce<Dictionary<ComponentInfo>>(
-          (acc, { component: _, ...info }) => ({
-            ...acc,
-            [info.name]: serializeIncludingFunctions(info),
-          }),
-          {}
-        ),
         inheritedStyles: {},
         BlocksWrapper: useTarget({
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -189,6 +177,7 @@ export default function ContentComponent(props: ContentProps) {
       enrich={props.enrich}
       showContent={props.showContent}
       builderContextSignal={builderContextSignal}
+      registeredComponents={state.registeredComponents}
       contentWrapper={props.contentWrapper}
       contentWrapperProps={props.contentWrapperProps}
       trustedHosts={props.trustedHosts}
diff --git a/packages/sdks/src/context/builder.context.lite.ts b/packages/sdks/src/context/builder.context.lite.ts
index ad92df3acc7..4e2164cb3f3 100644
--- a/packages/sdks/src/context/builder.context.lite.ts
+++ b/packages/sdks/src/context/builder.context.lite.ts
@@ -10,7 +10,6 @@ export default createContext<BuilderContextInterface>(
     rootState: {},
     apiKey: null,
     apiVersion: undefined,
-    componentInfos: {},
     inheritedStyles: {},
     BlocksWrapper: 'div',
     BlocksWrapperProps: {},
diff --git a/packages/sdks/src/context/types.ts b/packages/sdks/src/context/types.ts
index 00a4b991289..00aecfb3d34 100644
--- a/packages/sdks/src/context/types.ts
+++ b/packages/sdks/src/context/types.ts
@@ -40,7 +40,6 @@ export interface BuilderContextInterface
   localState: BuilderRenderState | undefined;
   apiKey: string | null;
   apiVersion: ApiVersion | undefined;
-  componentInfos: Dictionary<ComponentInfo>;
   // Used to recursively store all CSS coming from a parent that would apply to a Text block
   inheritedStyles: Record<string, unknown>;
   nonce: string;