diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
index ef36e04b..2a55b31e 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
@@ -83,9 +83,7 @@ open class TabBarModel: MoleculeModelProtocol {
         if let index = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedTab) {
             selectedTab = index
         }
-        if let style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style) {
-            self.style = style
-        }
+        style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
     }
               
     open func encode(to encoder: Encoder) throws {
diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
index 122c0763..16897c67 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift
@@ -89,9 +89,7 @@ open class TabsModel: MoleculeModelProtocol {
         _selectedColor = try typeContainer.decodeIfPresent(Color.self, forKey: .selectedColor)
         _unselectedColor = try typeContainer.decodeIfPresent(Color.self, forKey: .unselectedColor)
         _selectedBarColor = try typeContainer.decodeIfPresent(Color.self, forKey: .selectedBarColor)
-        if let style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style) {
-            self.style = style
-        }
+        style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
         if let index = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedIndex) {
             selectedIndex = index
         }
diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
index ac73ff18..dc2800b3 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
@@ -109,9 +109,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
         additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons)
         additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons)
         titleView = try typeContainer.decodeModelIfPresent(codingKey: .titleView)
-        if let style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style) {
-            self.style = style
-        }
+        style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
     }
               
     open func encode(to encoder: Encoder) throws {