diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Payments Menu/InPersonPaymentsMenu.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Payments Menu/InPersonPaymentsMenu.swift
index 199c7030497..55a2453105a 100644
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Payments Menu/InPersonPaymentsMenu.swift	
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Payments Menu/InPersonPaymentsMenu.swift	
@@ -179,8 +179,10 @@ struct InPersonPaymentsMenu: View {
         }
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {
-                ActivityIndicator(isAnimating: $viewModel.backgroundOnboardingInProgress,
-                                  style: .medium)
+                if viewModel.backgroundOnboardingInProgress {
+                    ActivityIndicator(isAnimating: $viewModel.backgroundOnboardingInProgress,
+                                      style: .medium)
+                }
             }
         }
         .navigationTitle(CardPresentPaymentsOnboardingView.Localization.title)