diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
index 19a4cbc0..2c2e4ae7 100644
--- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
+++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
@@ -364,10 +364,9 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
     
     private func go(to index: Int) async {
         // Load controller from the cache
-        guard index != self.index,
+        guard index != tabs.selectedIndex,
               let controller = viewControllers[index] else { return }
         needToTrackTabSelect = true
-        self.index = index
         await NavigationHandler.shared().replace(viewController: controller, navigationController:subNavigationController, delegateObject:delegateObject(), tryToReplace: false, animated: true)
     }