diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 8f0a42198e..91088d2261 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -678,7 +678,7 @@ module.exports = createReactClass({
         }
 
         let identityServer;
-        if (this.props.pickerType === 'user' && !this.state.validAddressTypes.includes('email')) {
+        if (this.props.pickerType === 'user' && this.props.validAddressTypes.includes('email')) {
             const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
             if (defaultIdentityServerUrl) {
                 identityServer = <div className="mx_AddressPickerDialog_identityServer">{_t(