diff --git a/frontend/src/ts/test/words-generator.ts b/frontend/src/ts/test/words-generator.ts
index 6438c2aa6..4c2d17092 100644
--- a/frontend/src/ts/test/words-generator.ts
+++ b/frontend/src/ts/test/words-generator.ts
@@ -738,7 +738,11 @@ export async function getNextWord(
 
       if (
         Config.mode === "time" ||
-        (Config.mode === "custom" && CustomText.getLimitMode() === "time")
+        (Config.mode === "custom" && CustomText.getLimitMode() === "time") ||
+        (Config.mode === "custom" &&
+          CustomText.getLimitMode() === "word" &&
+          wordIndex < CustomText.getLimitValue()) ||
+        (Config.mode === "words" && wordIndex < Config.words)
       ) {
         continueRandomGeneration = true;
       }