diff --git a/MVMCoreUI/Atomic/Molecules/Breadcrumbs/Breadcrumbs.swift b/MVMCoreUI/Atomic/Molecules/Breadcrumbs/Breadcrumbs.swift
index 6498ecb5..7faf54ce 100644
--- a/MVMCoreUI/Atomic/Molecules/Breadcrumbs/Breadcrumbs.swift
+++ b/MVMCoreUI/Atomic/Molecules/Breadcrumbs/Breadcrumbs.swift
@@ -44,18 +44,14 @@ import VDS
         isEnabled = viewModel.enabled
         surface = viewModel.surface
         breadcrumbModels = viewModel.breadcrumbs.compactMap { [unowned self] breadcrumb in
-            var onClick: ((BreadcrumbItem) -> Void)?
-            if let action = breadcrumb.action {
-                onClick = { _ in
-                    MVMCoreUIActionHandler.performActionUnstructured(with: action, 
-                                                                     sourceModel: breadcrumb,
-                                                                     additionalData: self.additionalData,
-                                                                     delegateObject: self.delegateObject)
-                }
-            }            
             return .init(text: breadcrumb.text,
                          selected: breadcrumb.selected,
-                         onClick: onClick)
+                         onClick: { _ in
+                MVMCoreUIActionHandler.performActionUnstructured(with: breadcrumb.action,
+                                                                 sourceModel: breadcrumb,
+                                                                 additionalData: self.additionalData,
+                                                                 delegateObject: self.delegateObject)
+            })
         }
     }
 
diff --git a/MVMCoreUI/Atomic/Molecules/Breadcrumbs/BreadcrumbsModel.swift b/MVMCoreUI/Atomic/Molecules/Breadcrumbs/BreadcrumbsModel.swift
index 6c8ba47c..d987bb38 100644
--- a/MVMCoreUI/Atomic/Molecules/Breadcrumbs/BreadcrumbsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Breadcrumbs/BreadcrumbsModel.swift
@@ -71,7 +71,7 @@ open class BreadcrumbModel: MoleculeModelProtocol {
 
     open var text: String = ""
     open var selected: Bool = false
-    open var action: ActionModelProtocol?
+    open var action: ActionModelProtocol
     
     
     //--------------------------------------------------
@@ -92,7 +92,7 @@ open class BreadcrumbModel: MoleculeModelProtocol {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         text = try container.decode(String.self, forKey: .text)
         selected = try container.decodeIfPresent(Bool.self, forKey: .selected) ?? false
-        action = try container.decodeModelIfPresent(codingKey: .action)
+        action = try container.decodeModel(codingKey: .action)
     }
     
     public func encode(to encoder: Encoder) throws {