diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
index 0771efb25e93..1162f39978a0 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
@@ -25,6 +25,7 @@ import { BOTTOMBAR_HEIGHT } from "./constants";
 import { useEditorType } from "ee/hooks";
 import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
 import DatasourceInfo from "./DatasourceInfo";
+import { getPlugin } from "ee/selectors/entitiesSelector";
 
 interface Props {
   datasourceId: string;
@@ -45,6 +46,8 @@ const Datasource = (props: Props) => {
     getPluginIdFromDatasourceId(state, props.datasourceId),
   );
 
+  const plugin = useSelector((state) => getPlugin(state, pluginId || ""));
+
   const editorType = useEditorType(location.pathname);
   const { parentEntityId } = useParentEntityInfo(editorType);
 
@@ -143,6 +146,7 @@ const Datasource = (props: Props) => {
         <DatasourceInfo
           datasourceId={props.datasourceId}
           datasourceName={props.datasourceName}
+          plugin={plugin}
           showEditButton={!isLoading}
         />
         <StatusDisplay
@@ -170,6 +174,7 @@ const Datasource = (props: Props) => {
           datasourceId={props.datasourceId}
           datasourceName={props.datasourceName}
           datasourceStructure={datasourceStructure}
+          plugin={plugin}
           selectedTable={selectedTable}
           setSelectedTable={setSelectedTable}
         />
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
index e671e70d4afc..acfa33571870 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
@@ -10,16 +10,19 @@ import { getQueryParams } from "utils/URLUtils";
 import history from "utils/history";
 import { useEditorType } from "ee/hooks";
 import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import type { Plugin } from "api/PluginApi";
 
 interface Props {
   datasourceId: string;
   datasourceName: string;
   showEditButton: boolean;
+  plugin?: Plugin;
 }
 
 const DatasourceInfo = ({
   datasourceId,
   datasourceName,
+  plugin,
   showEditButton,
 }: Props) => {
   const editorType = useEditorType(location.pathname);
@@ -50,6 +53,7 @@ const DatasourceInfo = ({
       <DatasourceSelector
         datasourceId={datasourceId}
         datasourceName={datasourceName}
+        plugin={plugin}
       />
       {showEditButton && (
         <Tooltip content={createMessage(EDIT_DS_CONFIG)} placement="top">
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
index 6f3ef2f510f1..252643232aaf 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
@@ -1,6 +1,5 @@
 import React from "react";
-import { UIComponentTypes } from "api/PluginApi";
-import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { UIComponentTypes, type Plugin } from "api/PluginApi";
 import ApiDatasourceSelector from "./ApiDatasourceSelector";
 import QueryDatasourceSelector from "./QueryDatasourceSelector";
 import {
@@ -16,16 +15,17 @@ const API_FORM_COMPONENTS = [
 export interface DatasourceProps {
   datasourceId: string;
   datasourceName: string;
+  plugin?: Plugin;
 }
 
 const DatasourceSelector = (props: DatasourceProps) => {
-  const { plugin } = usePluginActionContext();
-
-  return API_FORM_COMPONENTS.includes(plugin.uiComponent) ? (
-    <ApiDatasourceSelector {...props} formName={API_EDITOR_FORM_NAME} />
-  ) : (
-    <QueryDatasourceSelector {...props} formName={QUERY_EDITOR_FORM_NAME} />
-  );
+  return props.plugin ? (
+    API_FORM_COMPONENTS.includes(props.plugin.uiComponent) ? (
+      <ApiDatasourceSelector {...props} formName={API_EDITOR_FORM_NAME} />
+    ) : (
+      <QueryDatasourceSelector {...props} formName={QUERY_EDITOR_FORM_NAME} />
+    )
+  ) : null;
 };
 
 export default DatasourceSelector;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx
index 1664ff7667aa..ef23751816ef 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx
@@ -9,12 +9,14 @@ import { refreshDatasourceStructure } from "actions/datasourceActions";
 import { useDispatch } from "react-redux";
 import { SchemaTableContainer } from "./styles";
 import DatasourceInfo from "./DatasourceInfo";
+import type { Plugin } from "api/PluginApi";
 
 interface Props {
   datasourceId: string;
   datasourceName: string;
   currentActionId: string;
   datasourceStructure: DatasourceStructure;
+  plugin?: Plugin;
   setSelectedTable: (table: string) => void;
   selectedTable: string | undefined;
 }
@@ -24,6 +26,7 @@ const DatasourceTables = ({
   datasourceId,
   datasourceName,
   datasourceStructure,
+  plugin,
   selectedTable,
   setSelectedTable,
 }: Props) => {
@@ -56,6 +59,7 @@ const DatasourceTables = ({
         <DatasourceInfo
           datasourceId={datasourceId}
           datasourceName={datasourceName}
+          plugin={plugin}
           showEditButton
         />
         <Button