diff --git a/app/client/ui/DocumentSettings.ts b/app/client/ui/DocumentSettings.ts
index 368d2324..1075b69a 100644
--- a/app/client/ui/DocumentSettings.ts
+++ b/app/client/ui/DocumentSettings.ts
@@ -52,7 +52,7 @@ export async function showDocSettingsModal(docInfo: DocInfoRec, docPageModel: Do
             {defaultCurrencyLabel: `Local currency (${getCurrency(l)})`})
         )),
         canChangeEngine ? [
-          cssDataRow('Engine:'),
+          cssDataRow('Engine (experimental ☠ change at own risk):'),
           select(engineObs, getSupportedEngineChoices()),
         ] : null,
       ],
diff --git a/app/server/lib/serverUtils.ts b/app/server/lib/serverUtils.ts
index 955cd4f3..57c2f9ab 100644
--- a/app/server/lib/serverUtils.ts
+++ b/app/server/lib/serverUtils.ts
@@ -155,7 +155,8 @@ export function getLogMetaFromDocSession(docSession: OptDocSession) {
  * Only offer choices of engine on experimental deployments (staging/dev).
  */
 export function getSupportedEngineChoices(): EngineCode[]|undefined {
-  if (process.env.GRIST_EXPERIMENTAL_PLUGINS === '1') {
+  if (process.env.GRIST_EXPERIMENTAL_PLUGINS === '1' ||
+      process.env.PYTHON_VERSION_ON_CREATION) {
     return ['python2', 'python3'];
   }
   return undefined;