diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index 175119e097..c6f4dc55b8 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -3,6 +3,7 @@
  * */
 import { get, omit } from "lodash";
 import { all, select, put, takeEvery, call, take } from "redux-saga/effects";
+import * as Sentry from "@sentry/react";
 import {
   ReduxAction,
   ReduxActionErrorTypes,
@@ -53,6 +54,8 @@ import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
 import { EventLocation } from "utils/AnalyticsUtil";
+import { Variant } from "components/ads/common";
+import { Toaster } from "components/ads/Toast";
 
 function* syncApiParamsSaga(
   actionPayload: ReduxActionWithMeta<string, { field: string }>,
@@ -411,6 +414,20 @@ function* handleApiNameChangeSuccessSaga(
   const { actionId } = action.payload;
   const actionObj = yield select(getAction, actionId);
   yield take(ReduxActionTypes.FETCH_ACTIONS_FOR_PAGE_SUCCESS);
+  if (!actionObj) {
+    // Error case, log to sentry
+    Toaster.show({
+      text: "Error occured while renaming API",
+      variant: Variant.danger,
+    });
+
+    Sentry.captureException(new Error("Error occured while renaming API"), {
+      extra: {
+        actionId: actionId,
+      },
+    });
+    return;
+  }
   if (actionObj.pluginType === PLUGIN_TYPE_API) {
     const params = getQueryParams();
     if (params.editName) {
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index fceba6928d..9a61c02a1f 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -7,6 +7,7 @@ import {
   call,
   race,
 } from "redux-saga/effects";
+import * as Sentry from "@sentry/react";
 import {
   ReduxAction,
   ReduxActionErrorTypes,
@@ -40,6 +41,8 @@ import { getQueryParams } from "utils/AppsmithUtils";
 import { QUERY_CONSTANT } from "constants/QueryEditorConstants";
 import { isEmpty, merge } from "lodash";
 import { getConfigInitialValues } from "components/formControls/utils";
+import { Variant } from "components/ads/common";
+import { Toaster } from "components/ads/Toast";
 
 function* changeQuerySaga(actionPayload: ReduxAction<{ id: string }>) {
   const { id } = actionPayload.payload;
@@ -183,6 +186,20 @@ function* handleNameChangeSuccessSaga(
   const { actionId } = action.payload;
   const actionObj = yield select(getAction, actionId);
   yield take(ReduxActionTypes.FETCH_ACTIONS_FOR_PAGE_SUCCESS);
+  if (!actionObj) {
+    // Error case, log to sentry
+    Toaster.show({
+      text: "Error occured while renaming query",
+      variant: Variant.danger,
+    });
+
+    Sentry.captureException(new Error("Error occured while renaming query"), {
+      extra: {
+        actionId: actionId,
+      },
+    });
+    return;
+  }
   if (actionObj.pluginType === QUERY_CONSTANT) {
     const params = getQueryParams();
     if (params.editName) {