diff --git a/src/context/index.ts b/src/context/index.ts
index 1d846e990..268dfcbce 100644
--- a/src/context/index.ts
+++ b/src/context/index.ts
@@ -26,7 +26,7 @@ const nonPrimitiveProps: (keyof Config)[] = [
   'INCLUDED_PROPS',
 ];
 
-const EA_FEATURES = ['ACUL'];
+const EA_FEATURES = [];
 
 export const setupContext = async (
   config: Config,
@@ -144,7 +144,7 @@ export const setupContext = async (
             : 'features [' + EA_FEATURES.join(',') + '] are'
         } enabled. These are in a pre-release state and may change in future release.`
       );
-    } else {
+    } else if (EA_FEATURES.length > 0) {
       log.info(
         'To enable experimental early access features use --experimental_ea flag or set AUTH0_EXPERIMENTAL_EA=true in configuration JSON.'
       );
diff --git a/src/tools/auth0/handlers/prompts.ts b/src/tools/auth0/handlers/prompts.ts
index 977921842..14a04a2b3 100644
--- a/src/tools/auth0/handlers/prompts.ts
+++ b/src/tools/auth0/handlers/prompts.ts
@@ -351,15 +351,11 @@ export default class PromptsHandler extends DefaultHandler {
       partials,
     };
 
-    const includeExperimentalEA = this.config('AUTH0_EXPERIMENTAL_EA') || false;
-
-    if (includeExperimentalEA) {
-      try {
-        const { data } = await this.client.prompts.getAllRenderingSettings();
-        prompts.screenRenderers = data;
-      } catch (error) {
-        log.warn(`Unable to fetch screen renderers: ${error}`);
-      }
+    try {
+      const { data } = await this.client.prompts.getAllRenderingSettings();
+      prompts.screenRenderers = data;
+    } catch (error) {
+      log.warn(`Unable to fetch screen renderers: ${error}`);
     }
 
     return prompts;
@@ -575,19 +571,11 @@ export default class PromptsHandler extends DefaultHandler {
       screenRenderer;
     if (!prompt || !screen) return;
 
-    let updatePayload: PatchRenderingRequest = {};
-
-    if (rendering_mode === PatchRenderingRequestRenderingModeEnum.standard) {
-      updatePayload = {
-        rendering_mode,
-      };
-    } else {
-      updatePayload = {
-        ...updatePrams,
-        rendering_mode,
-        default_head_tags_disabled: default_head_tags_disabled || undefined,
-      };
-    }
+    const updatePayload = {
+      ...updatePrams,
+      rendering_mode,
+      default_head_tags_disabled: default_head_tags_disabled || undefined,
+    };
 
     try {
       await this.client.prompts.updateRendering(
diff --git a/test/context/yaml/context.test.js b/test/context/yaml/context.test.js
index f98688eca..a0bdaeaa1 100644
--- a/test/context/yaml/context.test.js
+++ b/test/context/yaml/context.test.js
@@ -303,6 +303,7 @@ describe('#YAML context validation', () => {
       prompts: {
         customText: {},
         partials: {},
+        screenRenderers: [],
       },
       customDomains: [],
       themes: [],
@@ -431,6 +432,7 @@ describe('#YAML context validation', () => {
       prompts: {
         customText: {},
         partials: {},
+        screenRenderers: [],
       },
       customDomains: [],
       themes: [],
@@ -559,6 +561,7 @@ describe('#YAML context validation', () => {
       prompts: {
         customText: {},
         partials: {},
+        screenRenderers: [],
       },
       logStreams: [],
       customDomains: [],