diff --git a/frontend/src/ts/test/words-generator.ts b/frontend/src/ts/test/words-generator.ts
index 4c2d17092..d8bcb2685 100644
--- a/frontend/src/ts/test/words-generator.ts
+++ b/frontend/src/ts/test/words-generator.ts
@@ -433,7 +433,10 @@ export function getWordsLimit(): number {
 
   //custom
   if (Config.mode === "custom") {
-    if (CustomText.getLimitValue() === 0) {
+    if (
+      CustomText.getLimitValue() === 0 ||
+      CustomText.getLimitMode() === "time"
+    ) {
       limit = 100;
     } else {
       limit =