diff --git a/espeak-ng-data/lang/urj/et b/espeak-ng-data/lang/urj/et
index 662448af..81aaf5a9 100644
--- a/espeak-ng-data/lang/urj/et
+++ b/espeak-ng-data/lang/urj/et
@@ -1,2 +1,4 @@
 name Estonian
 language et
+
+stressOpt 1 2 4 6 // (S_NO_DIM + S_FINAL_DIM = S_FINAL_DIM_ONLY), S_FINAL_NO_2, S_2_TO_HEAVY
diff --git a/espeak-ng-data/lang/urj/fi b/espeak-ng-data/lang/urj/fi
index ef14b147..4ae57a9d 100644
--- a/espeak-ng-data/lang/urj/fi
+++ b/espeak-ng-data/lang/urj/fi
@@ -1,2 +1,4 @@
 name Finnish
 language fi
+
+stressOpt 1 2 4 6 // (S_NO_DIM + S_FINAL_DIM = S_FINAL_DIM_ONLY), S_FINAL_NO_2, S_2_TO_HEAVY
diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c
index 30ff5f34..4feb86a9 100644
--- a/src/libespeak-ng/tr_languages.c
+++ b/src/libespeak-ng/tr_languages.c
@@ -807,7 +807,6 @@ Translator *SelectTranslator(const char *name)
 		SetupTranslator(tr, stress_lengths_fi, stress_amps_fi);
 
 		tr->langopts.stress_rule = STRESSPOSN_1L;
-		tr->langopts.stress_flags = S_FINAL_DIM_ONLY | S_FINAL_NO_2 | S_2_TO_HEAVY; // move secondary stress from light to a following heavy syllable
 		tr->langopts.param[LOPT_IT_DOUBLING] = 1;
 		tr->langopts.long_stop = 130;