diff --git a/src/Common/CosmosClient.ts b/src/Common/CosmosClient.ts
index 7e8a7f04c..f8491e564 100644
--- a/src/Common/CosmosClient.ts
+++ b/src/Common/CosmosClient.ts
@@ -18,10 +18,8 @@ const _global = typeof self === "undefined" ? window : self;
 export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
   const { verb, resourceId, resourceType, headers } = requestInfo;
 
-  const aadDataPlaneFeatureEnabled =
-    userContext.features.enableAadDataPlane && userContext.databaseAccount.properties.disableLocalAuth;
   const dataPlaneRBACOptionEnabled = userContext.dataPlaneRbacEnabled && userContext.apiType === "SQL";
-  if (aadDataPlaneFeatureEnabled || (!userContext.features.enableAadDataPlane && dataPlaneRBACOptionEnabled)) {
+  if (userContext.features.enableAadDataPlane || dataPlaneRBACOptionEnabled) {
     Logger.logInfo(
       `AAD Data Plane Feature flag set to ${userContext.features.enableAadDataPlane} for account with disable local auth ${userContext.databaseAccount.properties.disableLocalAuth} `,
       "Explorer/tokenProvider",
diff --git a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
index bb1435077..ef277b53f 100644
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -27,7 +27,7 @@ import {
 } from "Shared/StorageUtility";
 import * as StringUtility from "Shared/StringUtility";
 import { updateUserContext, userContext } from "UserContext";
-import { logConsoleInfo } from "Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo } from "Utils/NotificationConsoleUtils";
 import * as PriorityBasedExecutionUtils from "Utils/PriorityBasedExecutionUtils";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useSidePanel } from "hooks/useSidePanel";
@@ -171,13 +171,18 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
         hasDataPlaneRbacSettingChanged: true,
       });
       const { databaseAccount: account, subscriptionId, resourceGroup } = userContext;
-      if (!userContext.features.enableAadDataPlane) {
-        const keys: DatabaseAccountListKeysResult = await listKeys(subscriptionId, resourceGroup, account.name);
+      if (!userContext.features.enableAadDataPlane && !userContext.masterKey) {
+        try {
+          const keys: DatabaseAccountListKeysResult = await listKeys(subscriptionId, resourceGroup, account.name);
 
-        if (keys.primaryMasterKey) {
-          updateUserContext({ masterKey: keys.primaryMasterKey });
+          if (keys.primaryMasterKey) {
+            updateUserContext({ masterKey: keys.primaryMasterKey });
 
-          useDataPlaneRbac.setState({ dataPlaneRbacEnabled: false });
+            useDataPlaneRbac.setState({ dataPlaneRbacEnabled: false });
+          }
+        } catch (error) {
+          logConsoleError(`Error occurred fetching keys for the account." ${error.message}`);
+          throw error;
         }
       }
     }
diff --git a/src/hooks/useKnockoutExplorer.ts b/src/hooks/useKnockoutExplorer.ts
index 22cc0b51d..8a0bfa149 100644
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -338,18 +338,6 @@ async function configureHostedWithAAD(config: AAD): Promise<Explorer> {
         );
         await fetchAndUpdateKeys(subscriptionId, resourceGroup, account.name);
       }
-    } else {
-      Logger.logInfo(
-        `AAD Feature flag is enabled for account ${account.name} with disable local auth set to ${account.properties.disableLocalAuth} `,
-        "Explorer/configureHostedWithAAD",
-      );
-      if (!account.properties.disableLocalAuth) {
-        Logger.logInfo(
-          `Fetching keys for ${userContext.apiType} account ${account.name} with AAD data plane feature enabled`,
-          "Explorer/configureHostedWithAAD",
-        );
-        await fetchAndUpdateKeys(subscriptionId, resourceGroup, account.name);
-      }
     }
   } catch (e) {
     if (userContext.features.enableAadDataPlane) {
@@ -470,7 +458,6 @@ async function fetchAndUpdateKeys(subscriptionId: string, resourceGroup: string,
     Logger.logInfo(`Fetching keys for ${userContext.apiType} account ${account}`, "Explorer/fetchAndUpdateKeys");
     const keys = await listKeys(subscriptionId, resourceGroup, account);
     Logger.logInfo(`Keys fetched for ${userContext.apiType} account ${account}`, "Explorer/fetchAndUpdateKeys");
-
     updateUserContext({
       masterKey: keys.primaryMasterKey,
     });
@@ -479,7 +466,7 @@ async function fetchAndUpdateKeys(subscriptionId: string, resourceGroup: string,
       "Explorer/fetchAndUpdateKeys",
     );
   } catch (error) {
-    console.error("Error during fetching keys or updating user context:", error);
+    logConsoleError(`Error occurred fetching keys for the account." ${error.message}`);
     Logger.logError(
       `Error during fetching keys or updating user context: ${error} for ${userContext.apiType} account ${account}`,
       "Explorer/fetchAndUpdateKeys",