diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
index 6116afc3..847103de 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
@@ -80,8 +80,8 @@
     
     // MARK: - UITabBarDelegate
     public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        guard item.tag != tabBar.selectedItem?.tag else { return }
-        self.model.selectedTab = item.tag
+        guard model.selectedTab != tabBar.selectedItem?.tag else { return }
+        model.selectedTab = item.tag
         Button.performButtonAction(with: model.tabs[item.tag].action, button: item, delegateObject: delegateObject, additionalData: nil)
     }
     
@@ -96,8 +96,7 @@
     
     public func selectTab(at index: Int) {
         MVMCoreDispatchUtility.performBlock(onMainThread: {
-            guard index != self.selectedItem?.tag,
-                  let newSelectedItem = self.items?[index] else { return }
+            guard let newSelectedItem = self.items?[index] else { return }
             self.selectedItem = newSelectedItem
             self.tabBar(self, didSelect: newSelectedItem)
         })