diff --git a/frontend/src/ts/test/words-generator.ts b/frontend/src/ts/test/words-generator.ts
index 90b7e365f..0d5a10dee 100644
--- a/frontend/src/ts/test/words-generator.ts
+++ b/frontend/src/ts/test/words-generator.ts
@@ -417,11 +417,7 @@ export function getWordsLimit(): number {
 
   //custom
   if (Config.mode === "custom") {
-    if (
-      CustomText.getLimitValue() === 0 ||
-      CustomText.getLimitMode() === "time" ||
-      CustomText.getLimitMode() === "section"
-    ) {
+    if (CustomText.getLimitValue() === 0) {
       limit = 100;
     } else {
       limit =
@@ -446,7 +442,8 @@ export function getWordsLimit(): number {
   if (
     Config.mode === "custom" &&
     CustomText.getLimitMode() === "word" &&
-    CustomText.getLimitValue() < limit
+    CustomText.getLimitValue() < limit &&
+    CustomText.getLimitValue() !== 0
   ) {
     limit = CustomText.getLimitValue();
   }