diff --git a/src/components/ENSListPage/ENSListPage.container.ts b/src/components/ENSListPage/ENSListPage.container.ts
index 5a3ba041a..985cda506 100644
--- a/src/components/ENSListPage/ENSListPage.container.ts
+++ b/src/components/ENSListPage/ENSListPage.container.ts
@@ -9,7 +9,6 @@ import { FETCH_ENS_LIST_REQUEST } from 'modules/ens/actions'
 import { getLands, getLoading as getLandsLoading, getError as getLandsError } from 'modules/land/selectors'
 import { FETCH_LANDS_REQUEST } from 'modules/land/actions'
 import { getAvatar, getName } from 'modules/profile/selectors'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 import { openModal } from 'decentraland-dapps/dist/modules/modal/actions'
 import { MapStateProps, MapDispatchProps, MapDispatch } from './ENSListPage.types'
 import ENSListPage from './ENSListPage'
@@ -26,7 +25,6 @@ const mapState = (state: RootState): MapStateProps => ({
     isLoadingType(getLoading(state), FETCH_ENS_LIST_REQUEST) ||
     isLoggingIn(state),
   isLoggedIn: isLoggedIn(state),
-  isEnsAddressEnabled: getIsEnsAddressEnabled(state),
   avatar: getAvatar(state)
 })
 
diff --git a/src/components/ENSListPage/ENSListPage.types.ts b/src/components/ENSListPage/ENSListPage.types.ts
index 8619f7ffd..e2959b9ef 100644
--- a/src/components/ENSListPage/ENSListPage.types.ts
+++ b/src/components/ENSListPage/ENSListPage.types.ts
@@ -18,7 +18,6 @@ export type Props = {
   hasProfileCreated: boolean
   isLoggedIn: boolean
   isLoading: boolean
-  isEnsAddressEnabled: boolean
   avatar: Avatar | null
   onNavigate: (path: string) => void
   onOpenModal: typeof openModal
@@ -31,7 +30,7 @@ export type State = {
 
 export type MapStateProps = Pick<
   Props,
-  'address' | 'alias' | 'ensList' | 'lands' | 'hasProfileCreated' | 'isLoading' | 'error' | 'isLoggedIn' | 'isEnsAddressEnabled' | 'avatar'
+  'address' | 'alias' | 'ensList' | 'lands' | 'hasProfileCreated' | 'isLoading' | 'error' | 'isLoggedIn' | 'avatar'
 >
 export type MapDispatchProps = Pick<Props, 'onNavigate' | 'onOpenModal'>
 export type MapDispatch = Dispatch
diff --git a/src/components/LandAssignENSPage/LandAssignENSPage.container.ts b/src/components/LandAssignENSPage/LandAssignENSPage.container.ts
index e13e65873..b5ef2af8e 100644
--- a/src/components/LandAssignENSPage/LandAssignENSPage.container.ts
+++ b/src/components/LandAssignENSPage/LandAssignENSPage.container.ts
@@ -23,7 +23,6 @@ import {
 } from 'modules/ens/selectors'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './LandAssignENSPage.types'
 import LandAssignENSPage from './LandAssignENSPage'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   const { landId, subdomain } = ownProps.match.params
@@ -37,7 +36,6 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
     isWaitingTxSetResolver: isLoadingType(getLoading(state), SET_ENS_RESOLVER_REQUEST) || isWaitingTxSetResolver(state),
     isWaitingTxSetContent: isLoadingType(getLoading(state), SET_ENS_CONTENT_REQUEST) || isWaitingTxSetLandContent(state, landId),
     isWaitingTxReclaim: ens ? isReclaimingName(state, ens.subdomain) || isWaitingTxReclaim(state) : false,
-    isEnsAddressEnabled: getIsEnsAddressEnabled(state),
     isLoading:
       isLoadingType(getLoading(state), SET_ENS_RESOLVER_REQUEST) ||
       isLoadingType(getLoading(state), SET_ENS_CONTENT_REQUEST) ||
diff --git a/src/components/LandAssignENSPage/LandAssignENSPage.types.ts b/src/components/LandAssignENSPage/LandAssignENSPage.types.ts
index b71c3dcd3..fc2e496de 100644
--- a/src/components/LandAssignENSPage/LandAssignENSPage.types.ts
+++ b/src/components/LandAssignENSPage/LandAssignENSPage.types.ts
@@ -23,7 +23,6 @@ export type Props = {
   isWaitingTxSetContent: boolean
   isWaitingTxSetResolver: boolean
   isWaitingTxReclaim: boolean
-  isEnsAddressEnabled: boolean
   onSetENSResolver: typeof setENSResolverRequest
   onSetENSContent: typeof setENSContentRequest
   onReclaimName: typeof reclaimNameRequest
@@ -33,7 +32,7 @@ export type Props = {
 
 export type MapStateProps = Pick<
   Props,
-  'ens' | 'isLoading' | 'error' | 'isWaitingTxSetContent' | 'isWaitingTxSetResolver' | 'isWaitingTxReclaim' | 'isEnsAddressEnabled'
+  'ens' | 'isLoading' | 'error' | 'isWaitingTxSetContent' | 'isWaitingTxSetResolver' | 'isWaitingTxReclaim'
 >
 export type MapDispatchProps = Pick<Props, 'onSetENSResolver' | 'onSetENSContent' | 'onReclaimName' | 'onBack' | 'onNavigate'>
 export type MapDispatch = Dispatch<
diff --git a/src/components/LandOperatorPage/LandOperatorPage.container.ts b/src/components/LandOperatorPage/LandOperatorPage.container.ts
index 5e5db4ca3..ce22598e1 100644
--- a/src/components/LandOperatorPage/LandOperatorPage.container.ts
+++ b/src/components/LandOperatorPage/LandOperatorPage.container.ts
@@ -1,16 +1,10 @@
 import { connect } from 'react-redux'
 import { setOperatorRequest } from 'modules/land/actions'
-import { RootState } from 'modules/common/types'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 import LandOperatorPage from './LandOperatorPage'
-import { MapDispatchProps, MapDispatch, MapStateProps } from './LandOperatorPage.types'
-
-const mapState = (state: RootState): MapStateProps => ({
-  isEnsAddressEnabled: getIsEnsAddressEnabled(state)
-})
+import { MapDispatchProps, MapDispatch } from './LandOperatorPage.types'
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
   onSetOperator: (land, address) => dispatch(setOperatorRequest(land, address))
 })
 
-export default connect(mapState, mapDispatch)(LandOperatorPage)
+export default connect(undefined, mapDispatch)(LandOperatorPage)
diff --git a/src/components/LandOperatorPage/LandOperatorPage.types.ts b/src/components/LandOperatorPage/LandOperatorPage.types.ts
index 5826d7da2..f62d2b220 100644
--- a/src/components/LandOperatorPage/LandOperatorPage.types.ts
+++ b/src/components/LandOperatorPage/LandOperatorPage.types.ts
@@ -2,10 +2,8 @@ import { Dispatch } from 'redux'
 import { setOperatorRequest } from 'modules/land/actions'
 
 export type Props = {
-  isEnsAddressEnabled: boolean
   onSetOperator: typeof setOperatorRequest
 }
 
-export type MapStateProps = Pick<Props, 'isEnsAddressEnabled'>
 export type MapDispatchProps = Pick<Props, 'onSetOperator'>
 export type MapDispatch = Dispatch
diff --git a/src/components/LandTransferPage/LandTransferPage.container.ts b/src/components/LandTransferPage/LandTransferPage.container.ts
index b8e0441ab..d97f23304 100644
--- a/src/components/LandTransferPage/LandTransferPage.container.ts
+++ b/src/components/LandTransferPage/LandTransferPage.container.ts
@@ -1,16 +1,10 @@
 import { connect } from 'react-redux'
 import { transferLandRequest } from 'modules/land/actions'
-import { RootState } from 'modules/common/types'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
-import { MapDispatchProps, MapDispatch, MapStateProps } from './LandTransferPage.types'
+import { MapDispatchProps, MapDispatch } from './LandTransferPage.types'
 import LandTransferPage from './LandTransferPage'
 
-const mapState = (state: RootState): MapStateProps => ({
-  isEnsAddressEnabled: getIsEnsAddressEnabled(state)
-})
-
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
   onTransfer: (land, address) => dispatch(transferLandRequest(land, address))
 })
 
-export default connect(mapState, mapDispatch)(LandTransferPage)
+export default connect(undefined, mapDispatch)(LandTransferPage)
diff --git a/src/components/LandTransferPage/LandTransferPage.types.ts b/src/components/LandTransferPage/LandTransferPage.types.ts
index b39344922..18a2ccd00 100644
--- a/src/components/LandTransferPage/LandTransferPage.types.ts
+++ b/src/components/LandTransferPage/LandTransferPage.types.ts
@@ -2,7 +2,6 @@ import { transferLandRequest, TransferLandRequestAction } from 'modules/land/act
 import { Dispatch } from 'redux'
 
 export type Props = {
-  isEnsAddressEnabled: boolean
   onTransfer: typeof transferLandRequest
 }
 
@@ -11,6 +10,5 @@ export type State = {
   isValid: boolean
 }
 
-export type MapStateProps = Pick<Props, 'isEnsAddressEnabled'>
 export type MapDispatchProps = Pick<Props, 'onTransfer'>
 export type MapDispatch = Dispatch<TransferLandRequestAction>
diff --git a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts
index 96d31bd03..b5e6be29e 100644
--- a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts
+++ b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts
@@ -11,7 +11,6 @@ import {
 import { getCollection, getLoading } from 'modules/collection/selectors'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './ManageCollectionRoleModal.types'
 import ManageCollectionRoleModal from './ManageCollectionRoleModal'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   const { collectionId } = ownProps.metadata
@@ -23,7 +22,6 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   return {
     wallet: getWallet(state)!,
     collection: getCollection(state, collectionId)!,
-    isEnsAddressEnabled: getIsEnsAddressEnabled(state),
     isLoading:
       isLoadingType(getLoading(state), SET_COLLECTION_MANAGERS_REQUEST) || isLoadingType(getLoading(state), SET_COLLECTION_MINTERS_REQUEST)
   }
diff --git a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts
index f2f501d55..96b270a96 100644
--- a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts
+++ b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts
@@ -14,7 +14,6 @@ export type Props = Omit<ModalProps, 'metadata'> & {
   wallet: Wallet
   collection: Collection
   isLoading: boolean
-  isEnsAddressEnabled: boolean
   onSetManagers: typeof setCollectionManagersRequest
   onSetMinters: typeof setCollectionMintersRequest
 }
@@ -29,7 +28,7 @@ export type ManageCollectionRoleModalMetadata = {
   roles: string[]
 }
 
-export type MapStateProps = Pick<Props, 'wallet' | 'collection' | 'isLoading' | 'isEnsAddressEnabled'>
+export type MapStateProps = Pick<Props, 'wallet' | 'collection' | 'isLoading'>
 export type MapDispatchProps = Pick<Props, 'onSetManagers' | 'onSetMinters'>
 export type MapDispatch = Dispatch<SetCollectionManagersRequestAction | SetCollectionMintersRequestAction>
 export type OwnProps = Pick<Props, 'metadata'>
diff --git a/src/components/Modals/MintItemsModal/MintItemsModal.container.ts b/src/components/Modals/MintItemsModal/MintItemsModal.container.ts
index a40919489..21bb09c4c 100644
--- a/src/components/Modals/MintItemsModal/MintItemsModal.container.ts
+++ b/src/components/Modals/MintItemsModal/MintItemsModal.container.ts
@@ -11,7 +11,6 @@ import { canMintItem, UNSYNCED_STATES } from 'modules/item/utils'
 import { getAuthorizedItems, getStatusByItemId } from 'modules/item/selectors'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './MintItemsModal.types'
 import MintItemsModal from './MintItemsModal'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   const { itemIds } = ownProps.metadata
@@ -45,7 +44,6 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
     ethAddress,
     collection,
     totalCollectionItems,
-    isEnsAddressEnabled: getIsEnsAddressEnabled(state),
     hasUnsyncedItems
   }
 }
diff --git a/src/components/Modals/MintItemsModal/MintItemsModal.tsx b/src/components/Modals/MintItemsModal/MintItemsModal.tsx
index 8f5544539..41dec3449 100644
--- a/src/components/Modals/MintItemsModal/MintItemsModal.tsx
+++ b/src/components/Modals/MintItemsModal/MintItemsModal.tsx
@@ -93,7 +93,7 @@ export default class MintItemsModal extends React.PureComponent<Props, State> {
   handleView = (newConfirmState: View) => this.setState({ confirm: newConfirmState })
 
   render() {
-    const { collection, totalCollectionItems, isLoading, isEnsAddressEnabled, hasUnsyncedItems, onClose } = this.props
+    const { collection, totalCollectionItems, isLoading, hasUnsyncedItems, onClose } = this.props
     const { itemMints, error, confirm } = this.state
 
     const items = this.props.items.concat(this.state.items)
@@ -195,15 +195,7 @@ export default class MintItemsModal extends React.PureComponent<Props, State> {
               {isEmpty ? (
                 <div className="empty">{t('mint_items_modal.no_items', { name: collection.name })}</div>
               ) : (
-                items.map(item => (
-                  <MintableItem
-                    key={item.id}
-                    item={item}
-                    mints={itemMints[item.id]}
-                    onChange={this.handleMintsChange}
-                    isEnsAddressEnabled={isEnsAddressEnabled}
-                  />
-                ))
+                items.map(item => <MintableItem key={item.id} item={item} mints={itemMints[item.id]} onChange={this.handleMintsChange} />)
               )}
               {isFull ? null : (
                 <ItemDropdown placeholder={t('mint_items_modal.add_item')} onChange={this.handleAddItems} filter={filterAddableItems} />
diff --git a/src/components/Modals/MintItemsModal/MintItemsModal.types.ts b/src/components/Modals/MintItemsModal/MintItemsModal.types.ts
index 8eb68c056..f4c056026 100644
--- a/src/components/Modals/MintItemsModal/MintItemsModal.types.ts
+++ b/src/components/Modals/MintItemsModal/MintItemsModal.types.ts
@@ -35,10 +35,7 @@ export type State = {
   confirm: View
 }
 
-export type MapStateProps = Pick<
-  Props,
-  'ethAddress' | 'collection' | 'items' | 'totalCollectionItems' | 'isLoading' | 'hasUnsyncedItems' | 'isEnsAddressEnabled'
->
+export type MapStateProps = Pick<Props, 'ethAddress' | 'collection' | 'items' | 'totalCollectionItems' | 'isLoading' | 'hasUnsyncedItems'>
 export type MapDispatchProps = Pick<Props, 'onMint'>
 export type MapDispatch = Dispatch<MintCollectionItemsRequestAction>
 export type OwnProps = Pick<Props, 'metadata'>
diff --git a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx
index a7a442bd7..a177891b9 100644
--- a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx
+++ b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx
@@ -79,7 +79,7 @@ export default class MintableItem extends React.PureComponent<Props> {
   }
 
   render() {
-    const { item, mints, isEnsAddressEnabled } = this.props
+    const { item, mints } = this.props
 
     return (
       <div className="MintableItem">
@@ -103,24 +103,12 @@ export default class MintableItem extends React.PureComponent<Props> {
         </Row>
         {mints.map(({ address, amount }, index) => (
           <Section key={index} className="mint" size="tiny">
-            {isEnsAddressEnabled ? (
-              <AddressField
-                value={address}
-                className="rounded-address"
-                fieldClassName="rounded"
-                onChange={this.getChangeAddressHandler(index)}
-              />
-            ) : (
-              <Field
-                className="rounded"
-                type="address"
-                placeholder={t('global.address')}
-                value={address || ''}
-                message={undefined}
-                error={!this.isValidAddress(address)}
-                onChange={this.getChangeAddressHandler(index)}
-              />
-            )}
+            <AddressField
+              value={address}
+              className="rounded-address"
+              fieldClassName="rounded"
+              onChange={this.getChangeAddressHandler(index)}
+            />
             <Field
               className="rounded"
               type="number"
diff --git a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts
index c099ffced..0097dff16 100644
--- a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts
+++ b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts
@@ -4,6 +4,5 @@ import { Mint } from 'modules/collection/types'
 export type Props = {
   item: Item
   mints: Partial<Mint>[]
-  isEnsAddressEnabled: boolean
   onChange: (item: Item, mints: Partial<Mint>[]) => void
 }
diff --git a/src/modules/features/selectors.spec.ts b/src/modules/features/selectors.spec.ts
index 2452d9a7d..29c985a62 100644
--- a/src/modules/features/selectors.spec.ts
+++ b/src/modules/features/selectors.spec.ts
@@ -1,7 +1,7 @@
 import { getIsFeatureEnabled } from 'decentraland-dapps/dist/modules/features/selectors'
 import { ApplicationName } from 'decentraland-dapps/dist/modules/features/types'
 import { RootState } from 'modules/common/types'
-import { getIsCreateSceneOnlySDK7Enabled, getIsMaintenanceEnabled, getIsSDK7TemplatesEnabled, getIsEnsAddressEnabled } from './selectors'
+import { getIsCreateSceneOnlySDK7Enabled, getIsMaintenanceEnabled, getIsSDK7TemplatesEnabled } from './selectors'
 import { FeatureName } from './types'
 
 jest.mock('decentraland-dapps/dist/modules/features/selectors')
@@ -55,8 +55,7 @@ describe('when getting if maintainance is enabled', () => {
 
 const ffSelectors = [
   { selector: getIsSDK7TemplatesEnabled, app: ApplicationName.BUILDER, feature: FeatureName.SDK7_TEMPLATES },
-  { selector: getIsCreateSceneOnlySDK7Enabled, app: ApplicationName.BUILDER, feature: FeatureName.CREATE_SCENE_ONLY_SDK7 },
-  { selector: getIsEnsAddressEnabled, app: ApplicationName.DAPPS, feature: FeatureName.ENS_ADDRESS }
+  { selector: getIsCreateSceneOnlySDK7Enabled, app: ApplicationName.BUILDER, feature: FeatureName.CREATE_SCENE_ONLY_SDK7 }
 ]
 
 ffSelectors.forEach(({ selector, app, feature }) => {
diff --git a/src/modules/features/selectors.ts b/src/modules/features/selectors.ts
index 518a7e766..60fb81584 100644
--- a/src/modules/features/selectors.ts
+++ b/src/modules/features/selectors.ts
@@ -45,11 +45,3 @@ export const getIsCreateSceneOnlySDK7Enabled = (state: RootState) => {
     return false
   }
 }
-
-export const getIsEnsAddressEnabled = (state: RootState) => {
-  try {
-    return getIsFeatureEnabled(state, ApplicationName.DAPPS, FeatureName.ENS_ADDRESS)
-  } catch (e) {
-    return false
-  }
-}