diff --git a/frontend/src/ts/test/words-generator.ts b/frontend/src/ts/test/words-generator.ts
index cd23d254bcc2..33f80bbf757a 100644
--- a/frontend/src/ts/test/words-generator.ts
+++ b/frontend/src/ts/test/words-generator.ts
@@ -403,6 +403,8 @@ export function getWordsLimit(): number {
   if (Config.mode === "words" && Config.words === 0) {
     limit = 100;
   }
+
+  //custom
   if (Config.mode === "custom") {
     if (
       CustomText.getLimitValue() === 0 ||
@@ -426,6 +428,14 @@ export function getWordsLimit(): number {
     limit = Config.words;
   }
 
+  if (
+    Config.mode === "custom" &&
+    CustomText.getLimitMode() === "word" &&
+    CustomText.getLimitValue() < limit
+  ) {
+    limit = CustomText.getLimitValue();
+  }
+
   return limit;
 }