diff --git a/packages/trader/src/Stores/Modules/Trading/trade-store.js b/packages/trader/src/Stores/Modules/Trading/trade-store.js
index 14a1a1bd0490..57131702dbba 100644
--- a/packages/trader/src/Stores/Modules/Trading/trade-store.js
+++ b/packages/trader/src/Stores/Modules/Trading/trade-store.js
@@ -393,10 +393,13 @@ export default class TradeStore extends BaseStore {
             }
         );
         reaction(
-            () => this.root_store.common.is_language_changing,
+            () => this.root_store.common.current_language,
             () => {
-                this.setValidationRules(getValidationRules());
-                this.changeDurationValidationRules();
+                if (!this.amount) {
+                    this.setValidationRules(getValidationRules());
+                    this.changeDurationValidationRules();
+                    this.validateAllProperties();
+                }
             }
         );
         when(