diff --git a/pages/accountLists.page.tsx b/pages/accountLists.page.tsx
index cc63d09f51..113a7b83d2 100644
--- a/pages/accountLists.page.tsx
+++ b/pages/accountLists.page.tsx
@@ -45,15 +45,16 @@ export const getServerSideProps = makeGetServerSideProps(async (session) => {
       query: GetAccountListsDocument,
     });
 
-    if (data.user.setup) {
-      // The user has not finished setting up, so start them on the tour
-      return {
-        redirect: {
-          destination: '/setup/start',
-          permanent: false,
-        },
-      };
-    }
+    // TODO(@canac): Uncomment this after tools go-live
+    // if (data.user.setup) {
+    //   // The user has not finished setting up, so start them on the tour
+    //   return {
+    //     redirect: {
+    //       destination: '/setup/start',
+    //       permanent: false,
+    //     },
+    //   };
+    // }
 
     if (data.accountLists.nodes.length === 1) {
       return {
diff --git a/src/components/Setup/SetupProvider.test.tsx b/src/components/Setup/SetupProvider.test.tsx
index caead16308..c3d2d62ff3 100644
--- a/src/components/Setup/SetupProvider.test.tsx
+++ b/src/components/Setup/SetupProvider.test.tsx
@@ -61,19 +61,21 @@ describe('SetupProvider', () => {
     expect(getByText('Page content')).toBeInTheDocument();
   });
 
-  it('redirects if the user needs to connect to create an account list', async () => {
+  // TODO(@canac): Remove this after tools go-live
+  /* eslint-disable jest/no-disabled-tests */
+  it.skip('redirects if the user needs to connect to create an account list', async () => {
     render(<TestComponent setup={UserSetupStageEnum.NoAccountLists} />);
 
     await waitFor(() => expect(push).toHaveBeenCalledWith('/setup/connect'));
   });
 
-  it('redirects if the user needs to connect to an organization', async () => {
+  it.skip('redirects if the user needs to connect to an organization', async () => {
     render(<TestComponent setup={UserSetupStageEnum.NoOrganizationAccount} />);
 
     await waitFor(() => expect(push).toHaveBeenCalledWith('/setup/connect'));
   });
 
-  it('redirects if the user needs to choose a default account', async () => {
+  it.skip('redirects if the user needs to choose a default account', async () => {
     render(<TestComponent setup={UserSetupStageEnum.NoDefaultAccountList} />);
 
     await waitFor(() => expect(push).toHaveBeenCalledWith('/setup/account'));
diff --git a/src/components/Setup/SetupProvider.tsx b/src/components/Setup/SetupProvider.tsx
index bf0d1489d6..4c407a277c 100644
--- a/src/components/Setup/SetupProvider.tsx
+++ b/src/components/Setup/SetupProvider.tsx
@@ -1,3 +1,5 @@
+// TODO(@canac): Remove this after tools go-live
+/* eslint-disable */
 import { useRouter } from 'next/router';
 import React, {
   ReactNode,
@@ -41,18 +43,19 @@ export const SetupProvider: React.FC<Props> = ({ children }) => {
       return;
     }
 
+    // TODO(@canac): Uncomment this after tools go-live
     // If the user hasn't completed crucial setup steps, take them to the tour
     // to finish setting up their account. If they are on the preferences stage
     // or beyond and manually typed in a URL, let them stay on the page they
     // were on.
-    if (
-      data.user.setup === UserSetupStageEnum.NoAccountLists ||
-      data.user.setup === UserSetupStageEnum.NoOrganizationAccount
-    ) {
-      push('/setup/connect');
-    } else if (data.user.setup === UserSetupStageEnum.NoDefaultAccountList) {
-      push('/setup/account');
-    }
+    // if (
+    //   data.user.setup === UserSetupStageEnum.NoAccountLists ||
+    //   data.user.setup === UserSetupStageEnum.NoOrganizationAccount
+    // ) {
+    //   push('/setup/connect');
+    // } else if (data.user.setup === UserSetupStageEnum.NoDefaultAccountList) {
+    //   push('/setup/account');
+    // }
   }, [data]);
 
   const settingUp = useMemo(() => {