diff --git a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/General_settings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/General_settings_Spec.ts
index 78feb07711..dfa19a0f8b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/General_settings_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/General_settings_Spec.ts
@@ -7,8 +7,9 @@ import { CURRENT_REPO, REPO } from "../../../../fixtures/REPO";
 describe("Admin Settings Page - General page validations", () => {
   it("1. TC# 2439 Verify 'Page title' changes upon changing Instance name", () => {
     adminSettings.NavigateToAdminSettings();
-    agHelper.TypeText(adminSettings._instanceName, "Testing Instance name");
+    agHelper.ClearNType(adminSettings._instanceName, "Testing Instance name");
     agHelper.ClickButton("Save");
+    agHelper.ValidateToastMessage("Successfully saved");
     if (CURRENT_REPO === REPO.CE) cy.title().should("eq", "Appsmith");
     //verifying that Instance name is not changed in CE
     else if (CURRENT_REPO === REPO.EE)
diff --git a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js
index 05a9222ffc..3656390f20 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js
@@ -84,7 +84,6 @@ describe("Embed settings options", function () {
     });
     cy.get(adminSettings.saveButton).click();
     cy.waitForServerRestart();
-    cy.get(adminSettings.restartNotice).should("not.exist");
     cy.get("@deployUrl").then((depUrl) => {
       cy.log("deployUrl is " + depUrl);
       deployUrl = depUrl;
@@ -110,7 +109,7 @@ describe("Embed settings options", function () {
     //   } = interception[1].response.body.data;
     //   expect(APPSMITH_ALLOWED_FRAME_ANCESTORS).to.equal("*");
     // });
-    cy.get(adminSettings.restartNotice).should("not.exist");
+    cy.log("deployUrl is " + deployUrl);
     cy.visit(deployUrl, { timeout: 60000 });
     getIframeBody().contains("Submit").should("exist");
     ValidateEditModeSetting(_.embedSettings.locators._allowAllText);
@@ -124,7 +123,7 @@ describe("Embed settings options", function () {
     });
     cy.get(adminSettings.saveButton).click();
     cy.waitForServerRestart();
-    cy.get(adminSettings.restartNotice).should("not.exist");
+    cy.log("deployUrl is " + deployUrl);
     cy.visit(deployUrl, { timeout: 60000 });
     // TODO: Commented out as it is flaky
     // cy.wait(["@getEnvVariables", "@getEnvVariables"]).then((interception) => {
diff --git a/app/client/cypress/support/AdminSettingsCommands.js b/app/client/cypress/support/AdminSettingsCommands.js
index 4c7609b0ab..605286753b 100644
--- a/app/client/cypress/support/AdminSettingsCommands.js
+++ b/app/client/cypress/support/AdminSettingsCommands.js
@@ -83,4 +83,5 @@ Cypress.Commands.add("waitForServerRestart", () => {
     win.location.reload();
   });
   agHelper.AssertElementVisibility(adminSettings.saveButton, true, 0, 30000);
+  agHelper.AssertElementAbsence(adminSettings.restartNotice, 30000);
 });
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 6096c4fc01..9a6e391148 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -814,17 +814,20 @@ export class AggregateHelper extends ReusableHelper {
           index: number;
           parseSpecialCharSeq: boolean;
           shouldFocus: boolean;
+          delay: number;
         }> = 0,
   ) {
     let index: number;
     let shouldFocus = true;
     let parseSpecialCharSeq = false;
+    let delay = 5;
 
     if (typeof indexOrOptions === "number") {
       index = indexOrOptions;
     } else {
       index = indexOrOptions.index || 0;
       parseSpecialCharSeq = indexOrOptions.parseSpecialCharSeq || false;
+      delay = indexOrOptions.delay || 5;
       shouldFocus =
         indexOrOptions.shouldFocus !== undefined
           ? indexOrOptions.shouldFocus
@@ -839,7 +842,7 @@ export class AggregateHelper extends ReusableHelper {
 
     return element.wait(100).type(value, {
       parseSpecialCharSequences: parseSpecialCharSeq,
-      delay: 5,
+      delay: delay,
       force: true,
     });
   }