diff --git a/js/src/forum/extendSubscriptionModal.js b/js/src/forum/extendSubscriptionModal.js
index 1a42d82..5474093 100644
--- a/js/src/forum/extendSubscriptionModal.js
+++ b/js/src/forum/extendSubscriptionModal.js
@@ -11,7 +11,12 @@ export default function extendSubscriptionModal() {
 
   extend(components.SubscriptionModal.prototype, 'oninit', function () {
     const tag = this.attrs.model;
-    const subscriptionLanguage = tag.subscriptionLanguage();
+    let subscriptionLanguage = tag.subscriptionLanguage();
+
+    if (!app.forum.attribute('fof-discussion-language.showAnyLangOpt') && subscriptionLanguage === null) {
+      subscriptionLanguage = app.translator.getLocale();
+    }
+
     this.language = Stream(subscriptionLanguage);
   });