diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
index 670c3b771a71..2bde2a3ffea4 100644
--- a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
+++ b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
@@ -764,10 +764,6 @@ class BrowserViewController: UIViewController,
             // in getting the value. When the delay happens the credit cards might not sync
             // as the default value is false
             self.profile.syncManager?.updateCreditCardAutofillStatus(value: autofillCreditCardStatus)
-
-            self.creditCardInitialSetupTelemetry()
-
-            FakespotUtils().addSettingTelemetry()
         }
     }
 
@@ -777,7 +773,7 @@ class BrowserViewController: UIViewController,
 
         DispatchQueue.main.async {
             self.overlayManager.setURLBar(urlBarView: self.urlBarView)
-            self.updateToolbarStateForTraitCollection(self.traitCollection)
+//            self.updateToolbarStateForTraitCollection(self.traitCollection)
 
             // Update theme of already existing views
             let theme = self.currentTheme()
@@ -4359,6 +4355,8 @@ extension BrowserViewController {
         trackAccessibility()
         trackNotificationPermission()
         appStartupTelemetry.sendStartupTelemetry()
+        creditCardInitialSetupTelemetry()
+        FakespotUtils().addSettingTelemetry()
     }
 
     func trackAccessibility() {