diff --git a/app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js
index d1ae914ce8..30e87049b7 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js
@@ -59,12 +59,4 @@ describe("Onboarding", function() {
     cy.PublishtheApp();
     cy.get(".t--continue-on-my-own").click();
   });
-
-  after(() => {
-    localStorage.removeItem("OnboardingState");
-    cy.window().then((window) => {
-      window.indexedDB.deleteDatabase("Appsmith");
-    });
-    cy.log("Cleared");
-  });
 });
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index bbdf39e556..35f0fd6d5d 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -33,6 +33,10 @@ Cypress.on("fail", (error, runnable) => {
 
 before(function() {
   cy.startServerAndRoutes();
+  // Clear indexedDB
+  cy.window().then((window) => {
+    window.indexedDB.deleteDatabase("Appsmith");
+  });
   const username = Cypress.env("USERNAME");
   const password = Cypress.env("PASSWORD");
   cy.LoginFromAPI(username, password);
@@ -43,7 +47,7 @@ before(function() {
     200,
   );
 
-  cy.generateUUID().then(id => {
+  cy.generateUUID().then((id) => {
     appId = id;
     cy.CreateApp(id);
     localStorage.setItem("AppName", appId);