diff --git a/modules/shared.py b/modules/shared.py
index 93cd2272..f1e12673 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -47,7 +47,7 @@ settings = {
     'prompt_lookup_num_tokens': 0,
     'max_tokens_second': 0,
     'max_updates_second': 0,
-    'auto_max_new_tokens': False,
+    'auto_max_new_tokens': True,
     'ban_eos_token': False,
     'add_bos_token': True,
     'skip_special_tokens': True,
diff --git a/settings-template.yaml b/settings-template.yaml
index b61dc4e0..93a64abb 100644
--- a/settings-template.yaml
+++ b/settings-template.yaml
@@ -19,7 +19,7 @@ max_new_tokens_max: 4096
 prompt_lookup_num_tokens: 0
 max_tokens_second: 0
 max_updates_second: 0
-auto_max_new_tokens: false
+auto_max_new_tokens: true
 ban_eos_token: false
 add_bos_token: true
 skip_special_tokens: true