diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx
index 55029fbaef..83e645f6da 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx
@@ -33,7 +33,7 @@ describe("useChangeActionCall hook", () => {
   });
 
   it("should dispatch changeApi when plugin type is API", () => {
-    const actionMock = { id: "actionId" };
+    const actionMock = { id: "actionId", baseId: "baseActionId" };
     const pluginMock = { id: "pluginId", type: PluginType.API };
 
     // Mock the return values of usePluginActionContext
@@ -53,6 +53,7 @@ describe("useChangeActionCall hook", () => {
   it("should dispatch changeQuery when plugin type is not API", () => {
     const actionMock = {
       id: "actionId",
+      baseId: "baseActionId",
       pageId: "pageId",
       applicationId: "applicationId",
       packageId: "packageId",
@@ -72,7 +73,7 @@ describe("useChangeActionCall hook", () => {
 
     // Expect changeQuery to be called with the correct parameters
     expect(changeQuery).toHaveBeenCalledWith({
-      baseQueryId: actionMock.id,
+      baseQueryId: actionMock.baseId,
       basePageId: actionMock.pageId,
       applicationId: actionMock.applicationId,
       packageId: actionMock.packageId,
@@ -81,7 +82,7 @@ describe("useChangeActionCall hook", () => {
     });
     expect(dispatchMock).toHaveBeenCalledWith(
       changeQuery({
-        baseQueryId: actionMock.id,
+        baseQueryId: actionMock.baseId,
         basePageId: actionMock.pageId,
         applicationId: actionMock.applicationId,
         packageId: actionMock.packageId,
@@ -106,7 +107,7 @@ describe("useChangeActionCall hook", () => {
   });
 
   it("should not dispatch any action if the action Id has not changed", () => {
-    const actionMock = { id: "actionId" };
+    const actionMock = { id: "actionId", baseId: "baseActionId" };
     const pluginMock = { id: "pluginId", type: PluginType.API };
 
     // First we mount, so it should be called as previous action id was undefined
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts
index ac1620ddcb..79b5be0f72 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts
@@ -11,8 +11,6 @@ export const useChangeActionCall = () => {
   const dispatch = useDispatch();
 
   useEffect(() => {
-    if (!plugin?.id || !action) return;
-
     if (prevActionId === action.id) return;
 
     switch (plugin?.type) {
@@ -22,7 +20,7 @@ export const useChangeActionCall = () => {
       default:
         dispatch(
           changeQuery({
-            baseQueryId: action?.id,
+            baseQueryId: action.baseId,
             basePageId: action.pageId,
             applicationId: action.applicationId,
             packageId: action.packageId,