diff --git a/json-components-registry.json b/json-components-registry.json
index de2c434..6b4cd2c 100644
--- a/json-components-registry.json
+++ b/json-components-registry.json
@@ -724,7 +724,8 @@
       "canHaveChildren": false,
       "description": "Navigation breadcrumb trail using the atoms/BreadcrumbNav JSON-safe items prop",
       "status": "supported",
-      "source": "atoms"
+      "source": "atoms",
+      "jsonCompatible": true
     },
     {
       "type": "ContextMenu",
diff --git a/src/components/atoms/Breadcrumb.tsx b/src/components/atoms/Breadcrumb.tsx
index 4cce34b..5134007 100644
--- a/src/components/atoms/Breadcrumb.tsx
+++ b/src/components/atoms/Breadcrumb.tsx
@@ -8,11 +8,11 @@ interface BreadcrumbItem {
 }
 
 interface BreadcrumbNavProps {
-  items: BreadcrumbItem[]
+  items?: BreadcrumbItem[]
   className?: string
 }
 
-export function BreadcrumbNav({ items, className }: BreadcrumbNavProps) {
+export function BreadcrumbNav({ items = [], className }: BreadcrumbNavProps) {
   return (
     <nav aria-label="Breadcrumb" className={cn('flex items-center gap-2', className)}>
       {items.map((item, index) => {
diff --git a/src/lib/component-definition-utils.ts b/src/lib/component-definition-utils.ts
index 9796af7..e857bfb 100644
--- a/src/lib/component-definition-utils.ts
+++ b/src/lib/component-definition-utils.ts
@@ -1,8 +1,6 @@
-import componentDefinitionsData from '@/lib/component-definitions.json'
 import { ComponentDefinition } from '@/lib/component-definition-types'
 import { ComponentType } from '@/types/json-ui'
-
-export const componentDefinitions = componentDefinitionsData as ComponentDefinition[]
+import { componentDefinitions } from '@/lib/component-definitions'
 
 export function getCategoryComponents(category: string): ComponentDefinition[] {
   return componentDefinitions.filter(c => c.category === category)
diff --git a/src/lib/component-definitions-utils.ts b/src/lib/component-definitions-utils.ts
index 1bc98d4..ffe7ec8 100644
--- a/src/lib/component-definitions-utils.ts
+++ b/src/lib/component-definitions-utils.ts
@@ -1,5 +1,5 @@
 import { ComponentType } from '@/types/json-ui'
-import componentDefinitionsData from '@/lib/component-definitions.json'
+import { componentDefinitions } from '@/lib/component-definitions'
 
 export interface ComponentDefinition {
   type: ComponentType
@@ -10,8 +10,6 @@ export interface ComponentDefinition {
   canHaveChildren?: boolean
 }
 
-export const componentDefinitions = componentDefinitionsData as ComponentDefinition[]
-
 export function getCategoryComponents(category: string): ComponentDefinition[] {
   return componentDefinitions.filter(component => component.category === category)
 }
diff --git a/src/lib/component-definitions.ts b/src/lib/component-definitions.ts
new file mode 100644
index 0000000..c560a1d
--- /dev/null
+++ b/src/lib/component-definitions.ts
@@ -0,0 +1,30 @@
+import componentDefinitionsData from '@/lib/component-definitions.json'
+import type { ComponentDefinition } from '@/lib/component-definition-types'
+
+export const componentDefinitions = (componentDefinitionsData as ComponentDefinition[]).map(
+  (definition) => {
+    if (definition.type !== 'Breadcrumb') {
+      return definition
+    }
+
+    return {
+      ...definition,
+      props: [
+        {
+          name: 'items',
+          type: 'BreadcrumbItem[]',
+          description: 'Breadcrumb items with labels and optional hrefs.',
+          supportsBinding: true,
+        },
+        {
+          name: 'className',
+          type: 'string',
+          description: 'Optional class names for the breadcrumb container.',
+          supportsBinding: true,
+        },
+      ],
+    }
+  }
+)
+
+export default componentDefinitions
diff --git a/src/lib/json-ui/component-registry.ts b/src/lib/json-ui/component-registry.ts
index 6d72682..36a5c38 100644
--- a/src/lib/json-ui/component-registry.ts
+++ b/src/lib/json-ui/component-registry.ts
@@ -22,7 +22,6 @@ import * as AtomComponents from '@/components/atoms'
 import * as MoleculeComponents from '@/components/molecules'
 import * as OrganismComponents from '@/components/organisms'
 import {
-  BreadcrumbWrapper,
   LazyBarChartWrapper,
   LazyD3BarChartWrapper,
   LazyLineChartWrapper,
@@ -210,7 +209,6 @@ export const organismComponents: UIComponentRegistry = buildRegistryFromNames(
 )
 
 export const jsonWrapperComponents: UIComponentRegistry = {
-  Breadcrumb: BreadcrumbWrapper,
   SaveIndicator: SaveIndicatorWrapper,
   LazyBarChart: LazyBarChartWrapper,
   LazyLineChart: LazyLineChartWrapper,
diff --git a/src/lib/json-ui/wrappers/BreadcrumbWrapper.tsx b/src/lib/json-ui/wrappers/BreadcrumbWrapper.tsx
deleted file mode 100644
index 22d0a28..0000000
--- a/src/lib/json-ui/wrappers/BreadcrumbWrapper.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BreadcrumbNav } from '@/components/atoms'
-import { cn } from '@/lib/utils'
-import type { BreadcrumbWrapperProps } from './interfaces'
-
-export function BreadcrumbWrapper({ items = [], className }: BreadcrumbWrapperProps) {
-  if (items.length === 0) {
-    return null
-  }
-
-  return <BreadcrumbNav items={items} className={cn('flex items-center', className)} />
-}
diff --git a/src/lib/json-ui/wrappers/index.ts b/src/lib/json-ui/wrappers/index.ts
index b0273a2..11b179b 100644
--- a/src/lib/json-ui/wrappers/index.ts
+++ b/src/lib/json-ui/wrappers/index.ts
@@ -1,4 +1,3 @@
-export { BreadcrumbWrapper } from './BreadcrumbWrapper'
 export { SaveIndicatorWrapper } from './SaveIndicatorWrapper'
 export { LazyBarChartWrapper } from './LazyBarChartWrapper'
 export { LazyLineChartWrapper } from './LazyLineChartWrapper'
diff --git a/src/lib/json-ui/wrappers/interfaces.ts b/src/lib/json-ui/wrappers/interfaces.ts
index f7914c9..2508e46 100644
--- a/src/lib/json-ui/wrappers/interfaces.ts
+++ b/src/lib/json-ui/wrappers/interfaces.ts
@@ -1,16 +1,6 @@
 import type { StorageBackendKey } from '@/components/storage/storageSettingsConfig'
 import type { UIComponent } from '@/types/json-ui'
 
-export interface BreadcrumbItem {
-  label: string
-  href?: string
-}
-
-export interface BreadcrumbWrapperProps {
-  items?: BreadcrumbItem[]
-  className?: string
-}
-
 export type SaveIndicatorStatus = 'saved' | 'synced'
 
 export interface SaveIndicatorWrapperProps {
diff --git a/src/types/json-ui.ts b/src/types/json-ui.ts
index 970a424..7e1cd9b 100644
--- a/src/types/json-ui.ts
+++ b/src/types/json-ui.ts
@@ -25,6 +25,16 @@ export type ComponentType =
   | 'PageHeaderContent' | 'PropertyEditor' | 'SchemaEditorCanvas' | 'SchemaEditorLayout'
   | 'SchemaEditorPropertiesPanel' | 'SchemaEditorSidebar' | 'SchemaEditorToolbar' | 'SearchBar' | 'ToolbarActions'
 
+export interface BreadcrumbItem {
+  label: string
+  href?: string
+}
+
+export interface BreadcrumbProps {
+  items?: BreadcrumbItem[]
+  className?: string
+}
+
 export type ActionType =
   | 'create' | 'update' | 'delete' | 'navigate'
   | 'show-toast' | 'open-dialog' | 'close-dialog'