diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index fc1e89661b..9729c9e23f 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -43,8 +43,10 @@ export default class CountryDropdown extends React.Component {
         this.state = {
             searchQuery: '',
         }
+    }
 
-        if (!props.value) {
+    componentWillMount() {
+        if (!this.props.value) {
             // If no value is given, we start with the first
             // country selected, but our parent component
             // doesn't know this, therefore we do this.