diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts
new file mode 100644
index 0000000000..78c2b888ca
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Switch/Switch2_spec.ts
@@ -0,0 +1,171 @@
+import {
+  agHelper,
+  draggableWidgets,
+  entityExplorer,
+  deployMode,
+  propPane,
+  table,
+  locators,
+} from "../../../../../support/Objects/ObjectsCore";
+
+import widgets from "../../../../../locators/Widgets.json";
+import commonloc from "../../../../../locators/commonlocators.json";
+
+describe("Switch widget testcases", () => {
+  const jsonData = `[
+        {
+          "name": "yes",
+          "code": "yes"
+        },
+        {
+          "name": "no",
+          "code": "no"
+        }
+      ]`;
+
+  before(() => {
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.SWITCH);
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT, 500, 200);
+    propPane.ToggleJSMode("Source Data", true);
+    propPane.UpdatePropertyFieldValue("Source Data", jsonData);
+    propPane.UpdatePropertyFieldValue("Default selected value", "no");
+  });
+
+  it("1. Validate general properties - Default state values set via JS", () => {
+    entityExplorer.SelectEntityByName("Switch1");
+    // set default state value to be fetched via the value set in select widget
+    propPane.EnterJSContext(
+      "Default state",
+      "{{Select1.selectedOptionValue == 'yes'}}",
+    );
+    // default value of select widget is set to 'no' so validate switch is off
+    agHelper.AssertElementExist(widgets.switchWidgetInactive);
+    // local function to test default state values
+    testSwitchDefaultState("yes");
+    testSwitchDefaultState("no");
+    // Check the switch is on and off based on select widget value in deploy mode
+    deployMode.DeployApp();
+    testSwitchDefaultState("yes");
+    testSwitchDefaultState("no");
+    deployMode.NavigateBacktoEditor();
+    // Check the switch is on and off based on select widget value in preview mode
+    agHelper.GetNClick(locators._enterPreviewMode);
+    testSwitchDefaultState("yes");
+    testSwitchDefaultState("no");
+    agHelper.GetNClick(locators._backToEditor);
+  });
+
+  it("2. Validate general properties - Visible via JS", () => {
+    entityExplorer.SelectEntityByName("Switch1");
+    propPane.EnterJSContext("Default state", "true");
+    propPane.EnterJSContext(
+      "Visible",
+      "{{Select1.selectedOptionValue == 'yes'}}",
+    );
+
+    deployMode.DeployApp();
+    agHelper.AssertElementAbsence(widgets.switchWidget);
+    testSwitchVisbility("yes");
+    testSwitchVisbility("no");
+    deployMode.NavigateBacktoEditor();
+
+    agHelper.GetNClick(locators._enterPreviewMode);
+    testSwitchVisbility("yes");
+    testSwitchVisbility("no");
+    agHelper.GetNClick(locators._backToEditor);
+  });
+
+  it("3. Validate general properties - Disabled", () => {
+    entityExplorer.SelectEntityByName("Switch1");
+    propPane.EnterJSContext("Visible", "true");
+    propPane.EnterJSContext("Default state", "false");
+
+    propPane.EnterJSContext(
+      "Disabled",
+      "{{Select1.selectedOptionValue == 'yes'}}",
+    );
+
+    deployMode.DeployApp();
+    testSwitchDisabled("yes");
+    testSwitchDisabled("no");
+    deployMode.NavigateBacktoEditor();
+
+    agHelper.GetNClick(locators._enterPreviewMode);
+    testSwitchDisabled("yes");
+    testSwitchDisabled("no");
+    agHelper.GetNClick(locators._backToEditor);
+  });
+
+  it("4. Validate error texts", () => {
+    entityExplorer.SelectEntityByName("Switch1");
+    propPane.EnterJSContext("Default state", "90");
+    agHelper.VerifyEvaluatedErrorMessage(
+      "This value does not evaluate to type boolean",
+    );
+    propPane.EnterJSContext("Default state", "TRUE");
+    agHelper.VerifyEvaluatedErrorMessage(
+      "This value does not evaluate to type boolean",
+    );
+    propPane.EnterJSContext("Visible", "0");
+    agHelper.VerifyEvaluatedErrorMessage(
+      "This value does not evaluate to type boolean",
+    );
+    propPane.EnterJSContext("Visible", "FALSE");
+    agHelper.VerifyEvaluatedErrorMessage(
+      "This value does not evaluate to type boolean",
+    );
+    propPane.EnterJSContext("Disabled", "{{Status1.value}}");
+    agHelper.VerifyEvaluatedErrorMessage("Status1 is not defined");
+  });
+
+  it("5. validate on change - via JS", () => {
+    entityExplorer.SelectEntityByName("Switch1");
+    propPane.EnterJSContext("Default state", "false");
+    propPane.EnterJSContext("Visible", "true");
+    propPane.EnterJSContext("Disabled", "false");
+    propPane.EnterJSContext(
+      "onChange",
+      "{{showAlert('Switch action perfomed')}}",
+    );
+    agHelper.GetNClick(widgets.switch);
+    agHelper.ValidateToastMessage("Switch action perfomed");
+    deployMode.DeployApp();
+    agHelper.GetNClick(widgets.switch);
+    agHelper.ValidateToastMessage("Switch action perfomed");
+  });
+
+  // based on the dropdown value set the switch widget is disabled or enabled
+  function testSwitchDisabled(dropdownValue: string): void {
+    agHelper.GetNClick(commonloc.selectButton);
+    agHelper.GetNClickByContains(table._selectMenuItem, dropdownValue);
+    if (dropdownValue == "yes") {
+      agHelper.AssertElementClassContainsDisabled(widgets.switchWidgetInactive);
+    } else {
+      agHelper.AssertElementExist(widgets.switchWidgetInactive);
+    }
+  }
+
+  function testSwitchVisbility(visibilityValue: string): void {
+    // In the select widget set the given value and assert switch widget is visible or not based on it
+    agHelper.GetNClick(commonloc.selectButton);
+    agHelper.GetNClickByContains(table._selectMenuItem, visibilityValue);
+    if (visibilityValue == "yes") {
+      agHelper.AssertElementExist(widgets.switchWidget);
+    } else {
+      agHelper.AssertElementAbsence(widgets.switchWidget);
+    }
+  }
+
+  function testSwitchDefaultState(dropdownValue: string): void {
+    // In the select widget set no and assert switch is off
+    agHelper.GetNClick(commonloc.selectButton);
+    agHelper.GetNClickByContains(table._selectMenuItem, dropdownValue);
+    if (dropdownValue == "yes") {
+      agHelper.AssertElementExist(widgets.switchWidgetActive);
+      agHelper.AssertElementAbsence(widgets.switchWidgetInactive);
+    } else {
+      agHelper.AssertElementExist(widgets.switchWidgetInactive);
+      agHelper.AssertElementAbsence(widgets.switchWidgetActive);
+    }
+  }
+});
diff --git a/app/client/cypress/locators/Widgets.json b/app/client/cypress/locators/Widgets.json
index a033ff7955..e0211fd9a3 100644
--- a/app/client/cypress/locators/Widgets.json
+++ b/app/client/cypress/locators/Widgets.json
@@ -79,6 +79,7 @@
   "tableOnRowSelect": ".t--property-control-onrowselected .t--open-dropdown-Select-Action",
   "switchInput": ".t--draggable-switchwidget span.t--widget-name",
   "switchLabel": ".t--draggable-switchwidget label",
+  "switch":".bp3-switch",
   "multiSelectInput": ".t--draggable-multiselectwidget span.t--widget-name",
   "multiSelectLabel": ".t--draggable-multiselectwidget label",
   "addColumn": ".t--add-column-btn",