diff --git a/src/components/CollectionDetailPage/CollectionDetailPage.container.ts b/src/components/CollectionDetailPage/CollectionDetailPage.container.ts
index 9e8a2de87..b41ad031c 100644
--- a/src/components/CollectionDetailPage/CollectionDetailPage.container.ts
+++ b/src/components/CollectionDetailPage/CollectionDetailPage.container.ts
@@ -12,7 +12,7 @@ import { MapStateProps, MapDispatchProps, MapDispatch } from './CollectionDetail
 import CollectionDetailPage from './CollectionDetailPage'
 
 const mapState = (state: RootState): MapStateProps => {
-  const collectionId = getCollectionId(state) || ''
+  const collectionId = getCollectionId() || ''
   const collection = getCollection(state, collectionId)
   const statusByCollectionId = getStatusByCollectionId(state)
 
diff --git a/src/components/CollectionProvider/CollectionProvider.container.ts b/src/components/CollectionProvider/CollectionProvider.container.ts
index f2326fdbb..238e1294f 100644
--- a/src/components/CollectionProvider/CollectionProvider.container.ts
+++ b/src/components/CollectionProvider/CollectionProvider.container.ts
@@ -15,7 +15,7 @@ import { getCuration } from 'modules/curations/collectionCuration/selectors'
 import { FETCH_ITEM_CURATIONS_REQUEST } from 'modules/curations/itemCuration/actions'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
-  const id = ownProps.id || getCollectionId(state)
+  const id = ownProps.id || getCollectionId()
   const collection = id ? getCollection(state, id) : null
   const items = collection ? getCollectionItems(state, collection.id) : []
   const paginatedItems = collection ? getPaginatedCollectionItems(state, collection.id, ownProps.itemsPageSize || DEFAULT_PAGE_SIZE) : []
diff --git a/src/components/ENSDetailPage/ENSDetailPage.container.ts b/src/components/ENSDetailPage/ENSDetailPage.container.ts
index e34b162f0..272968b4d 100644
--- a/src/components/ENSDetailPage/ENSDetailPage.container.ts
+++ b/src/components/ENSDetailPage/ENSDetailPage.container.ts
@@ -12,7 +12,7 @@ import { MapStateProps, MapDispatchProps } from './ENSDetailPage.types'
 import ENSDetailPage from './ENSDetailPage'
 
 const mapState = (state: RootState): MapStateProps => {
-  const name = getENSName(state)
+  const name = getENSName()
   return {
     name,
     ens: name ? getENSBySubdomain(state, `${name}.dcl.eth`) : null,
diff --git a/src/components/ItemDetailPage/ItemDetailPage.container.ts b/src/components/ItemDetailPage/ItemDetailPage.container.ts
index cc1b27e78..68a5145f7 100644
--- a/src/components/ItemDetailPage/ItemDetailPage.container.ts
+++ b/src/components/ItemDetailPage/ItemDetailPage.container.ts
@@ -12,7 +12,7 @@ import ItemDetailPage from './ItemDetailPage'
 import { getIsWearableUtilityEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState): MapStateProps => {
-  const itemId = getItemId(state)
+  const itemId = getItemId()
   const item = itemId ? getItem(state, itemId) : null
   const wallet = getWallet(state)!
   const collection = item && item.collectionId ? getCollection(state, item.collectionId) : null
diff --git a/src/components/ItemEditorPage/CenterPanel/CenterPanel.container.ts b/src/components/ItemEditorPage/CenterPanel/CenterPanel.container.ts
index 8a6760dff..15748cae1 100644
--- a/src/components/ItemEditorPage/CenterPanel/CenterPanel.container.ts
+++ b/src/components/ItemEditorPage/CenterPanel/CenterPanel.container.ts
@@ -37,7 +37,7 @@ import CenterPanel from './CenterPanel'
 const mapState = (state: RootState): MapStateProps => {
   const address = getAddress(state)
   let collection: Collection | undefined
-  const collectionId = getSelectedCollectionId(state)
+  const collectionId = getSelectedCollectionId()
   // Emotes created by the user
   let emotes = getEmotes(state)
   if (collectionId) {
diff --git a/src/components/ItemEditorPage/LeftPanel/Header/Header.container.ts b/src/components/ItemEditorPage/LeftPanel/Header/Header.container.ts
index cc2838496..d267874b8 100644
--- a/src/components/ItemEditorPage/LeftPanel/Header/Header.container.ts
+++ b/src/components/ItemEditorPage/LeftPanel/Header/Header.container.ts
@@ -14,7 +14,7 @@ import Header from './Header'
 
 const mapState = (state: RootState): MapStateProps => {
   let collection: Collection | undefined
-  const collectionId = getSelectedCollectionId(state)
+  const collectionId = getSelectedCollectionId()
   if (collectionId) {
     const collections = getCollections(state)
     collection = collections.find(collection => collection.id === collectionId)
@@ -23,7 +23,7 @@ const mapState = (state: RootState): MapStateProps => {
   return {
     address,
     isLoggedIn: isLoggedIn(state),
-    isReviewing: isReviewing(state),
+    isReviewing: isReviewing(),
     collection,
     hasEditRights: collection !== undefined && address !== undefined && hasViewAndEditRights(state, address, collection),
     hasUserOrphanItems: hasUserOrphanItems(state)
diff --git a/src/components/ItemEditorPage/LeftPanel/LeftPanel.container.ts b/src/components/ItemEditorPage/LeftPanel/LeftPanel.container.ts
index 21e6b791f..532af099f 100644
--- a/src/components/ItemEditorPage/LeftPanel/LeftPanel.container.ts
+++ b/src/components/ItemEditorPage/LeftPanel/LeftPanel.container.ts
@@ -27,7 +27,7 @@ import { MapStateProps, MapDispatchProps, MapDispatch } from './LeftPanel.types'
 import LeftPanel from './LeftPanel'
 
 const mapState = (state: RootState): MapStateProps => {
-  const selectedCollectionId = getSelectedCollectionId(state)
+  const selectedCollectionId = getSelectedCollectionId()
   const address = getAddress(state)
   const itemsPaginationData = selectedCollectionId
     ? getPaginationData(state, selectedCollectionId)
@@ -55,7 +55,7 @@ const mapState = (state: RootState): MapStateProps => {
     visibleItems: getVisibleItems(state),
     bodyShape: getBodyShape(state),
     wearableController: getWearablePreviewController(state),
-    isReviewing: isReviewing(state),
+    isReviewing: isReviewing(),
     isLoading: isLoadingType(getLoading(state), FETCH_ITEMS_REQUEST) || isLoadingType(getLoading(state), FETCH_ORPHAN_ITEM_REQUEST),
     isPlayingEmote: isPlayingEmote(state),
     hasUserOrphanItems: hasUserOrphanItems(state)
diff --git a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.container.ts b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.container.ts
deleted file mode 100644
index d8e7bdb75..000000000
--- a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.container.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { connect } from 'react-redux'
-import { RootState } from 'modules/common/types'
-import { MapStateProps } from './ItemAddedToast.types'
-import TableRow from './ItemAddedToast'
-import { getNewItemName } from 'modules/item/selectors'
-
-const mapState = (state: RootState): MapStateProps => ({
-  itemName: getNewItemName(state)
-})
-
-export default connect(mapState)(TableRow)
diff --git a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.tsx b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.tsx
index 5bd9ff6c6..590c4eb9d 100644
--- a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.tsx
+++ b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import { Button, Toast, ToastType } from 'decentraland-ui'
 import { Link, useHistory, useLocation } from 'react-router-dom'
+import { getNewItemName } from 'modules/item/selectors'
 import { locations } from 'routing/locations'
 import { T, t } from 'decentraland-dapps/dist/modules/translation/utils'
 
@@ -10,11 +11,12 @@ import { Props } from './ItemAddedToast.types'
 import './ItemAddedToast.css'
 
 const ItemAddedToast: React.FC<Props> = props => {
-  const { collectionId, itemName } = props
+  const { collectionId } = props
   const [shouldShowToast, setShouldShowToast] = useState(false)
   const [item, setItem] = useState<string | null>(null)
   const history = useHistory()
   const location = useLocation()
+  const itemName = getNewItemName()
 
   useEffect(() => {
     if (itemName) {
diff --git a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.types.ts b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.types.ts
index c2d172914..e4625d810 100644
--- a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.types.ts
+++ b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/ItemAddedToast.types.ts
@@ -1,6 +1,3 @@
 export type Props = {
   collectionId: string | null
-  itemName: string | null
 }
-
-export type MapStateProps = Pick<Props, 'itemName'>
diff --git a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/index.ts b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/index.ts
index e7c18477d..ab2ce9eb3 100644
--- a/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/index.ts
+++ b/src/components/ItemEditorPage/LeftPanel/Toasts/ItemAdded/index.ts
@@ -1,3 +1,3 @@
-import ItemAddedToast from './ItemAddedToast.container'
+import ItemAddedToast from './ItemAddedToast'
 
 export { ItemAddedToast }
diff --git a/src/components/ItemEditorPage/TopPanel/TopPanel.container.ts b/src/components/ItemEditorPage/TopPanel/TopPanel.container.ts
index bfbc445cd..f762476db 100644
--- a/src/components/ItemEditorPage/TopPanel/TopPanel.container.ts
+++ b/src/components/ItemEditorPage/TopPanel/TopPanel.container.ts
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
 import { getAddress, getChainId, getLoading, isConnected } from 'decentraland-dapps/dist/modules/wallet/selectors'
 import { RootState } from 'modules/common/types'
+import { withRouter } from 'react-router-dom'
 import { isWalletCommitteeMember } from 'modules/committee/selectors'
 import { getSelectedCollectionId, isReviewing } from 'modules/location/selectors'
 import { setCollectionCurationAssigneeRequest } from 'modules/curations/collectionCuration/actions'
@@ -17,7 +17,7 @@ import { getCuration } from 'modules/curations/collectionCuration/selectors'
 import { getItemCurations, getLoading as getLoadingItemCurations } from 'modules/curations/itemCuration/selectors'
 
 const mapState = (state: RootState): MapStateProps => {
-  const selectedCollectionId = getSelectedCollectionId(state)
+  const selectedCollectionId = getSelectedCollectionId()
   const collection = selectedCollectionId ? getCollection(state, selectedCollectionId) : null
   const items = collection ? getCollectionItems(state, collection.id) : []
   const itemCurations = collection ? getItemCurations(state, collection.id) : []
@@ -32,9 +32,9 @@ const mapState = (state: RootState): MapStateProps => {
     curation,
     chainId: getChainId(state),
     isConnected: isConnected(state),
-    isReviewing: isReviewing(state),
+    isReviewing: isReviewing(),
     isCommitteeMember: isWalletCommitteeMember(state),
-    selectedCollectionId: getSelectedCollectionId(state),
+    selectedCollectionId: getSelectedCollectionId(),
     isLoading:
       isLoadingType(getLoading(state), FETCH_COLLECTION_REQUEST) ||
       isLoadingType(getLoadingItemCurations(state), FETCH_ITEM_CURATIONS_REQUEST) ||
@@ -43,10 +43,9 @@ const mapState = (state: RootState): MapStateProps => {
 }
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
-  onNavigate: path => dispatch(push(path)),
   onSetAssignee: (collectionId, assignee, curation) => dispatch(setCollectionCurationAssigneeRequest(collectionId, assignee, curation)),
   onInitiateTPApprovalFlow: collection => dispatch(initiateTPApprovalFlow(collection)),
   onInitiateApprovalFlow: collection => dispatch(initiateApprovalFlow(collection))
 })
 
-export default connect(mapState, mapDispatch)(TopPanel)
+export default connect(mapState, mapDispatch)(withRouter(TopPanel))
diff --git a/src/components/ItemEditorPage/TopPanel/TopPanel.tsx b/src/components/ItemEditorPage/TopPanel/TopPanel.tsx
index 4b423c967..a1c459bd7 100644
--- a/src/components/ItemEditorPage/TopPanel/TopPanel.tsx
+++ b/src/components/ItemEditorPage/TopPanel/TopPanel.tsx
@@ -22,7 +22,8 @@ export default class TopPanel extends React.PureComponent<Props, State> {
   }
 
   handleBack = () => {
-    this.props.onNavigate(locations.curation())
+    const { history } = this.props
+    history.push(locations.curation())
   }
 
   handleConfirmApprovalModal = (collection: Collection, curation: CollectionCuration | null) => {
diff --git a/src/components/ItemEditorPage/TopPanel/TopPanel.types.ts b/src/components/ItemEditorPage/TopPanel/TopPanel.types.ts
index ba5a2b27d..c9abef8e8 100644
--- a/src/components/ItemEditorPage/TopPanel/TopPanel.types.ts
+++ b/src/components/ItemEditorPage/TopPanel/TopPanel.types.ts
@@ -1,6 +1,6 @@
 import { Dispatch } from 'redux'
-import { CallHistoryMethodAction } from 'connected-react-router'
 import { ChainId } from '@dcl/schemas'
+import { RouteComponentProps } from 'react-router-dom'
 import {
   initiateApprovalFlow,
   InitiateApprovalFlowAction,
@@ -31,11 +31,10 @@ export type Props = {
   isReviewing: boolean
   isCommitteeMember: boolean
   selectedCollectionId: string | null
-  onNavigate: (path: string) => void
   onInitiateApprovalFlow: typeof initiateApprovalFlow
   onInitiateTPApprovalFlow: typeof initiateTPApprovalFlow
   onSetAssignee: typeof setCollectionCurationAssigneeRequest
-}
+} & RouteComponentProps
 
 export type State = {
   currentVeredict?: boolean
@@ -65,7 +64,5 @@ export type MapStateProps = Pick<
   | 'isCommitteeMember'
   | 'selectedCollectionId'
 >
-export type MapDispatchProps = Pick<Props, 'onNavigate' | 'onInitiateApprovalFlow' | 'onInitiateTPApprovalFlow' | 'onSetAssignee'>
-export type MapDispatch = Dispatch<
-  CallHistoryMethodAction | InitiateApprovalFlowAction | InitiateTPApprovalFlowAction | SetCollectionCurationAssigneeRequestAction
->
+export type MapDispatchProps = Pick<Props, 'onInitiateApprovalFlow' | 'onInitiateTPApprovalFlow' | 'onSetAssignee'>
+export type MapDispatch = Dispatch<InitiateApprovalFlowAction | InitiateTPApprovalFlowAction | SetCollectionCurationAssigneeRequestAction>
diff --git a/src/components/ItemProvider/ItemProvider.container.ts b/src/components/ItemProvider/ItemProvider.container.ts
index 068002ba8..28b05d60b 100644
--- a/src/components/ItemProvider/ItemProvider.container.ts
+++ b/src/components/ItemProvider/ItemProvider.container.ts
@@ -12,7 +12,7 @@ import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './ItemPr
 import ItemProvider from './ItemProvider'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
-  const id = ownProps.id || getItemId(state)
+  const id = ownProps.id || getItemId()
   const items = getItems(state)
   const collections = getCollections(state)
 
diff --git a/src/components/LandDetailPage/LandDetailPage.container.ts b/src/components/LandDetailPage/LandDetailPage.container.ts
index fcb127715..54d3d04fd 100644
--- a/src/components/LandDetailPage/LandDetailPage.container.ts
+++ b/src/components/LandDetailPage/LandDetailPage.container.ts
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import { push, replace } from 'connected-react-router'
+import { withRouter } from 'react-router-dom'
 import { RootState } from 'modules/common/types'
 import { getLandId } from 'modules/location/selectors'
 import { openModal } from 'decentraland-dapps/dist/modules/modal/actions'
@@ -10,7 +10,7 @@ import { MapStateProps, MapDispatchProps, MapDispatch } from './LandDetailPage.t
 import LandDetailPage from './LandDetailPage'
 
 const mapState = (state: RootState): MapStateProps => {
-  const landId = getLandId(state) || ''
+  const landId = getLandId() || ''
   return {
     ensList: getENSForLand(state, landId),
     parcelsAvailableToBuildEstates: getParcelsAvailableToBuildEstates(state),
@@ -21,9 +21,7 @@ const mapState = (state: RootState): MapStateProps => {
 }
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
-  onNavigate: path => dispatch(push(path)),
-  onReplace: path => dispatch(replace(path)),
   onOpenModal: (name, metadata) => dispatch(openModal(name, metadata))
 })
 
-export default connect(mapState, mapDispatch)(LandDetailPage)
+export default connect(mapState, mapDispatch)(withRouter(LandDetailPage))
diff --git a/src/components/LandDetailPage/LandDetailPage.tsx b/src/components/LandDetailPage/LandDetailPage.tsx
index 8151aa5fc..716cb60fd 100644
--- a/src/components/LandDetailPage/LandDetailPage.tsx
+++ b/src/components/LandDetailPage/LandDetailPage.tsx
@@ -64,13 +64,13 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
   }
 
   handleClick = (x: number, y: number) => {
-    const { deploymentsByCoord, projects, onNavigate, onReplace, landTiles } = this.props
+    const { deploymentsByCoord, projects, history, landTiles } = this.props
     const id = coordsToId(x, y)
     const deployment = deploymentsByCoord[id]
     if (deployment && deployment.projectId && deployment.projectId in projects) {
-      onNavigate(locations.sceneDetail(deployment.projectId))
+      history.push(locations.sceneDetail(deployment.projectId))
     } else if (id in landTiles) {
-      onReplace(locations.landDetail(landTiles[id].land.id))
+      history.replace(locations.landDetail(landTiles[id].land.id))
     }
   }
 
@@ -110,7 +110,7 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
   }
 
   renderDetail(land: Land, deployments: Deployment[], rental: Rental | null) {
-    const { ensList, parcelsAvailableToBuildEstates, projects, onNavigate, onOpenModal } = this.props
+    const { ensList, parcelsAvailableToBuildEstates, projects, history, onOpenModal } = this.props
     const { hovered, mouseX, mouseY, showTooltip } = this.state
     const occupiedTotal = this.computeOccupiedLand(land, deployments)
     const landOwner = rental && (land.roles.includes(RoleType.LESSOR) || land.roles.includes(RoleType.TENANT)) ? rental.lessor : land.owner
@@ -128,7 +128,7 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
         ) : null}
         <Section size="large">
           <Row>
-            <Back absolute onClick={() => onNavigate(locations.land())} />
+            <Back absolute onClick={() => history.push(locations.land())} />
             <Narrow>
               <Row>
                 <Column>
@@ -151,12 +151,12 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
                   <Column className="actions" align="right">
                     <Row>
                       <RentedLandWrapper land={land}>
-                        <Button basic onClick={() => onNavigate(locations.landTransfer(land.id))}>
+                        <Button basic onClick={() => history.push(locations.landTransfer(land.id))}>
                           {t('land_detail_page.transfer')}
                         </Button>
                       </RentedLandWrapper>
                       <RentedLandWrapper land={land}>
-                        <Button basic onClick={() => onNavigate(locations.landEdit(land.id))}>
+                        <Button basic onClick={() => history.push(locations.landEdit(land.id))}>
                           {t('global.edit')}
                         </Button>
                       </RentedLandWrapper>
@@ -196,13 +196,13 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
                             <>
                               <Dropdown.Item
                                 text={t('land_detail_page.assign_name')}
-                                onClick={() => onNavigate(locations.landSelectENS(land.id))}
+                                onClick={() => history.push(locations.landSelectENS(land.id))}
                               />
                               <Dropdown.Divider />
                             </>
                             <Dropdown.Item
                               text={t('land_detail_page.set_operator')}
-                              onClick={() => onNavigate(locations.landOperator(land.id))}
+                              onClick={() => history.push(locations.landOperator(land.id))}
                             />
                           </Dropdown.Menu>
                         </Dropdown>
@@ -222,7 +222,7 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
                     <Dropdown.Menu>
                       <Dropdown.Item
                         text={t('land_detail_page.set_operator')}
-                        onClick={() => onNavigate(locations.landOperator(land.id))}
+                        onClick={() => history.push(locations.landOperator(land.id))}
                       />
                     </Dropdown.Menu>
                   </Dropdown>
@@ -261,7 +261,7 @@ export default class LandDetailPage extends React.PureComponent<Props, State> {
                       deployment={deployment}
                       onMouseEnter={this.handleMouseEnter}
                       onMouseLeave={this.handleMouseLeave}
-                      onNavigate={onNavigate}
+                      onNavigate={(path: string) => history.push(path)}
                       onOpenModal={onOpenModal}
                       projects={projects}
                     />
diff --git a/src/components/LandDetailPage/LandDetailPage.types.ts b/src/components/LandDetailPage/LandDetailPage.types.ts
index c8493a85b..6fa5973a4 100644
--- a/src/components/LandDetailPage/LandDetailPage.types.ts
+++ b/src/components/LandDetailPage/LandDetailPage.types.ts
@@ -1,5 +1,5 @@
 import { Dispatch } from 'redux'
-import { CallHistoryMethodAction } from 'connected-react-router'
+import { RouteComponentProps } from 'react-router-dom'
 import { ProjectState } from 'modules/project/reducer'
 import { openModal, OpenModalAction } from 'decentraland-dapps/dist/modules/modal/actions'
 import { Deployment } from 'modules/deployment/types'
@@ -12,10 +12,8 @@ export type Props = {
   deploymentsByCoord: Record<string, Deployment>
   landTiles: Record<string, LandTile>
   projects: ProjectState['data']
-  onNavigate: (path: string) => void
-  onReplace: (path: string) => void
   onOpenModal: typeof openModal
-}
+} & RouteComponentProps
 
 export type State = {
   hovered: Deployment | null
@@ -25,5 +23,5 @@ export type State = {
 }
 
 export type MapStateProps = Pick<Props, 'ensList' | 'parcelsAvailableToBuildEstates' | 'deploymentsByCoord' | 'projects' | 'landTiles'>
-export type MapDispatchProps = Pick<Props, 'onNavigate' | 'onOpenModal' | 'onReplace'>
-export type MapDispatch = Dispatch<CallHistoryMethodAction | OpenModalAction>
+export type MapDispatchProps = Pick<Props, 'onOpenModal'>
+export type MapDispatch = Dispatch<OpenModalAction>
diff --git a/src/components/LandProvider/LandProvider.container.ts b/src/components/LandProvider/LandProvider.container.ts
index 106584707..43088f7b0 100644
--- a/src/components/LandProvider/LandProvider.container.ts
+++ b/src/components/LandProvider/LandProvider.container.ts
@@ -11,7 +11,7 @@ import { MapStateProps, OwnProps } from './LandProvider.types'
 import LandProvider from './LandProvider'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
-  const id = ownProps.id || getLandId(state)
+  const id = ownProps.id || getLandId()
   const lands = getLands(state)
   const land = lands.find(land => land.id === id) || null
 
diff --git a/src/components/SceneDetailPage/SceneDetailPage.container.ts b/src/components/SceneDetailPage/SceneDetailPage.container.ts
index 2456679e9..b86062de5 100644
--- a/src/components/SceneDetailPage/SceneDetailPage.container.ts
+++ b/src/components/SceneDetailPage/SceneDetailPage.container.ts
@@ -1,5 +1,4 @@
 import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
 import { isLoadingType } from 'decentraland-dapps/dist/modules/loading/selectors'
 import { RootState } from 'modules/common/types'
 import { FETCH_LANDS_REQUEST } from 'modules/land/actions'
@@ -17,7 +16,7 @@ import { MapStateProps, MapDispatchProps, MapDispatch } from './SceneDetailPage.
 import SceneDetailPage from './SceneDetailPage'
 
 const mapState = (state: RootState): MapStateProps => {
-  const projectId = getProjectId(state)
+  const projectId = getProjectId()
   const projects = getProjects(state)
   const project = projectId && projectId in projects ? projects[projectId] : null
   const deploymentsByProjectId = getDeploymentsByProjectId(state)
@@ -37,7 +36,6 @@ const mapState = (state: RootState): MapStateProps => {
 }
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
-  onNavigate: path => dispatch(push(path)),
   onOpenModal: (name, metadata) => dispatch(openModal(name, metadata)),
   onDelete: project => dispatch(deleteProject(project)),
   onDuplicate: project => dispatch(duplicateProjectRequest(project)),
diff --git a/src/components/SceneDetailPage/SceneDetailPage.tsx b/src/components/SceneDetailPage/SceneDetailPage.tsx
index 6f81317b1..197480f03 100644
--- a/src/components/SceneDetailPage/SceneDetailPage.tsx
+++ b/src/components/SceneDetailPage/SceneDetailPage.tsx
@@ -14,11 +14,13 @@ import SDKTag from 'components/SDKTag/SDKTag'
 import DeploymentDetail from './DeploymentDetail'
 import MigrateSceneToSDK7 from './MigrateSceneToSDK7'
 import './SceneDetailPage.css'
+import { useHistory } from 'react-router'
 
 const SceneDetailPage: React.FC<Props> = props => {
-  const { project, scene, isLoading, deployments, onOpenModal, onDelete, onDuplicate, onNavigate, onLoadProjectScene } = props
+  const { project, scene, isLoading, deployments, onOpenModal, onDelete, onDuplicate, onLoadProjectScene } = props
   const [isDeleting, setIsDeleting] = useState(false)
   const [showMigrationModal, setShowMigrationModal] = useState(false)
+  const history = useHistory()
 
   useEffect(() => {
     if (project && !scene) {
@@ -63,9 +65,9 @@ const SceneDetailPage: React.FC<Props> = props => {
     if (scene?.sdk6) {
       setShowMigrationModal(true)
     } else {
-      onNavigate(locations.inspector(project?.id))
+      history.push(locations.inspector(project?.id))
     }
-  }, [project, scene, onNavigate])
+  }, [project, scene, history])
 
   const getSceneStatus = () => {
     const { project, isLoading, isLoadingDeployments } = props
@@ -77,15 +79,22 @@ const SceneDetailPage: React.FC<Props> = props => {
     return <DeploymentStatus projectId={project.id} className="deployment-status" />
   }
 
+  const handleNavigate = useCallback(
+    (location: string) => {
+      history.push(location)
+    },
+    [history]
+  )
+
   const renderPage = (project: Project, deployments: Deployment[]) => {
-    const { isLoadingDeployments, onNavigate, onOpenModal, scene } = props
+    const { isLoadingDeployments, onOpenModal, scene } = props
     return (
       <>
         <Section size="large">
           <Row>
             <Column>
               <Row>
-                <Back absolute onClick={() => onNavigate(locations.scenes())} />
+                <Back absolute onClick={() => handleNavigate(locations.scenes())} />
                 <Header className="name">
                   {project.title}
                   <Icon name="edit outline" onClick={handleEditClick} />
@@ -179,7 +188,7 @@ const SceneDetailPage: React.FC<Props> = props => {
           </>
         ) : null}
         {showMigrationModal && (
-          <MigrateSceneToSDK7 project={project} scene={scene} onNavigate={onNavigate} onClose={() => setShowMigrationModal(false)} />
+          <MigrateSceneToSDK7 project={project} scene={scene} onNavigate={handleNavigate} onClose={() => setShowMigrationModal(false)} />
         )}
       </Page>
       <Footer />
diff --git a/src/components/SceneDetailPage/SceneDetailPage.types.ts b/src/components/SceneDetailPage/SceneDetailPage.types.ts
index 8bf2e0e96..f360f7802 100644
--- a/src/components/SceneDetailPage/SceneDetailPage.types.ts
+++ b/src/components/SceneDetailPage/SceneDetailPage.types.ts
@@ -1,5 +1,4 @@
 import { Dispatch } from 'redux'
-import { CallHistoryMethodAction } from 'connected-react-router'
 import { Project } from 'modules/project/types'
 import { Deployment } from 'modules/deployment/types'
 import { openModal, OpenModalAction } from 'decentraland-dapps/dist/modules/modal/actions'
@@ -19,7 +18,6 @@ export type Props = {
   isLoading: boolean
   isLoadingDeployments: boolean
   scene: Scene | null
-  onNavigate: (path: string) => void
   onOpenModal: typeof openModal
   onDelete: typeof deleteProject
   onDuplicate: typeof duplicateProjectRequest
@@ -27,7 +25,5 @@ export type Props = {
 }
 
 export type MapStateProps = Pick<Props, 'project' | 'deployments' | 'isLoading' | 'isLoadingDeployments' | 'scene'>
-export type MapDispatchProps = Pick<Props, 'onNavigate' | 'onDelete' | 'onDuplicate' | 'onOpenModal' | 'onLoadProjectScene'>
-export type MapDispatch = Dispatch<
-  CallHistoryMethodAction | DeleteProjectAction | DuplicateProjectRequestAction | OpenModalAction | LoadProjectSceneRequestAction
->
+export type MapDispatchProps = Pick<Props, 'onDelete' | 'onDuplicate' | 'onOpenModal' | 'onLoadProjectScene'>
+export type MapDispatch = Dispatch<DeleteProjectAction | DuplicateProjectRequestAction | OpenModalAction | LoadProjectSceneRequestAction>
diff --git a/src/components/SceneListPage/SceneListPage.container.ts b/src/components/SceneListPage/SceneListPage.container.ts
index e53b58938..3d654404f 100644
--- a/src/components/SceneListPage/SceneListPage.container.ts
+++ b/src/components/SceneListPage/SceneListPage.container.ts
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux'
-import { getLocation, push } from 'connected-react-router'
-import { locations } from 'routing/locations'
+import { withRouter } from 'react-router'
 
 import {
   getPoolList,
@@ -23,25 +22,21 @@ import { MapStateProps, MapDispatch, MapDispatchProps } from './SceneListPage.ty
 import SceneListPage from './SceneListPage'
 
 const mapState = (state: RootState): MapStateProps => ({
-  location: getLocation(state),
   pools: getPoolList(state),
   poolGroups: getAllPoolGroups(state),
   total: getTotal(state),
   totalPages: getTotalPages(state),
-  page: getPage(state),
-  sortBy: getSortBy(state),
-  sortOrder: getSortOrder(state),
-  group: getSearchGroup(state),
-  ethAddress: getSearchEthAddress(state),
+  page: getPage(),
+  sortBy: getSortBy(),
+  sortOrder: getSortOrder(),
+  group: getSearchGroup(),
+  ethAddress: getSearchEthAddress(),
   isLoggedIn: isLoggedIn(state)
 })
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
   onOpenModal: (name, metadata) => dispatch(openModal(name, metadata)),
-  onLoadPools: (filters: PoolsRequestFilters) => dispatch(loadPoolsRequest(filters)),
-  onPageChange: (filters: PoolsRequestFilters) => dispatch(push(locations.poolSearch(filters))),
-  onNavigateToScenes: () => dispatch(push(locations.scenes())),
-  onNavegateToViewPool: (poolId: string) => dispatch(push(locations.poolView(poolId)))
+  onLoadPools: (filters: PoolsRequestFilters) => dispatch(loadPoolsRequest(filters))
 })
 
-export default connect(mapState, mapDispatch)(SceneListPage)
+export default connect(mapState, mapDispatch)(withRouter(SceneListPage))
diff --git a/src/components/SceneListPage/SceneListPage.tsx b/src/components/SceneListPage/SceneListPage.tsx
index a440e60ce..335cf55c1 100644
--- a/src/components/SceneListPage/SceneListPage.tsx
+++ b/src/components/SceneListPage/SceneListPage.tsx
@@ -20,6 +20,7 @@ import Footer from 'components/Footer'
 import Navbar from 'components/Navbar'
 import Back from 'components/Back'
 import { PoolsRequestFilters, SortBy } from 'modules/pool/types'
+import { locations } from 'routing/locations'
 
 import { Props, filterAttributes } from './SceneListPage.types'
 import PoolCard from './PoolCard'
@@ -49,8 +50,8 @@ export default class SceneListPage extends React.PureComponent<Props> {
   }
 
   handleChangeFilters(filters: PoolsRequestFilters) {
-    const { onPageChange, onLoadPools } = this.props
-    onPageChange(filters)
+    const { history, onLoadPools } = this.props
+    history.push(locations.poolSearch(filters))
     onLoadPools(filters)
   }
 
@@ -96,8 +97,13 @@ export default class SceneListPage extends React.PureComponent<Props> {
     }
   }
 
+  handleNavigateToScenes = () => {
+    const { history } = this.props
+    history.push(locations.scenes())
+  }
+
   render() {
-    const { pools, total, totalPages, isLoggedIn, onNavigateToScenes } = this.props
+    const { pools, total, totalPages, isLoggedIn } = this.props
     const filters = this.getFilters()
 
     const paginationProps: Record<string, any> = {
@@ -120,7 +126,7 @@ export default class SceneListPage extends React.PureComponent<Props> {
             <Container>
               <Section className="navigation">
                 <Row>
-                  <Back absolute onClick={onNavigateToScenes}></Back>
+                  <Back absolute onClick={this.handleNavigateToScenes}></Back>
                   <Narrow>
                     <Row>
                       <Column>
diff --git a/src/components/SceneListPage/SceneListPage.types.ts b/src/components/SceneListPage/SceneListPage.types.ts
index 359def010..fb3801262 100644
--- a/src/components/SceneListPage/SceneListPage.types.ts
+++ b/src/components/SceneListPage/SceneListPage.types.ts
@@ -1,31 +1,27 @@
 import { Dispatch } from 'redux'
-import { Location } from 'history'
-import { CallHistoryMethodAction } from 'connected-react-router'
 
 import { Pool, PoolsRequestFilters } from 'modules/pool/types'
 import { LikePoolRequestAction, LoadPoolsRequestAction, loadPoolsRequest } from 'modules/pool/actions'
 import { openModal, OpenModalAction } from 'decentraland-dapps/dist/modules/modal/actions'
 import { PoolGroup } from 'modules/poolGroup/types'
+import { RouteComponentProps } from 'react-router'
 
-export type Props = PoolsRequestFilters & {
-  location: Location
-  pools: Pool[] | null
-  poolGroups: PoolGroup[]
-  total: number | null
-  totalPages: number | null
-  isLoggedIn: boolean
-  onNavigateToScenes: () => void
-  onNavegateToViewPool: (poolId: string) => void
-  onPageChange: (filters: PoolsRequestFilters) => void
-  onLoadPools: typeof loadPoolsRequest
-  onOpenModal: typeof openModal
-}
+export type Props = PoolsRequestFilters &
+  RouteComponentProps & {
+    pools: Pool[] | null
+    poolGroups: PoolGroup[]
+    total: number | null
+    totalPages: number | null
+    isLoggedIn: boolean
+    onLoadPools: typeof loadPoolsRequest
+    onOpenModal: typeof openModal
+  }
 
 export type MapStateProps = Pick<
   Props,
-  'location' | 'pools' | 'poolGroups' | 'total' | 'totalPages' | 'page' | 'sortBy' | 'sortOrder' | 'group' | 'ethAddress' | 'isLoggedIn'
+  'pools' | 'poolGroups' | 'total' | 'totalPages' | 'page' | 'sortBy' | 'sortOrder' | 'group' | 'ethAddress' | 'isLoggedIn'
 >
-export type MapDispatchProps = Pick<Props, 'onOpenModal' | 'onPageChange' | 'onNavigateToScenes' | 'onNavegateToViewPool' | 'onLoadPools'>
-export type MapDispatch = Dispatch<LikePoolRequestAction | OpenModalAction | LoadPoolsRequestAction | CallHistoryMethodAction>
+export type MapDispatchProps = Pick<Props, 'onOpenModal' | 'onLoadPools'>
+export type MapDispatch = Dispatch<LikePoolRequestAction | OpenModalAction | LoadPoolsRequestAction>
 
 export const filterAttributes = ['page', 'sortBy', 'sortOrder', 'group', 'ethAddress'] as (keyof PoolsRequestFilters)[]
diff --git a/src/components/ScenesPage/ScenesPage.container.ts b/src/components/ScenesPage/ScenesPage.container.ts
index c84c7ff83..8366c3c32 100644
--- a/src/components/ScenesPage/ScenesPage.container.ts
+++ b/src/components/ScenesPage/ScenesPage.container.ts
@@ -15,7 +15,7 @@ const mapState = (state: RootState): MapStateProps => ({
   isLoggingIn: isLoggingIn(state) || isConnecting(state),
   isFetching: isFetching(state),
   page: getPage(state),
-  sortBy: getSortBy(state),
+  sortBy: getSortBy(),
   totalPages: getTotalPages(state),
   didCreate: didCreate(state),
   poolList: getPoolList(state)
diff --git a/src/components/TemplateDetailPage/TemplateDetailPage.container.ts b/src/components/TemplateDetailPage/TemplateDetailPage.container.ts
index 98f5502d1..eb424c0f5 100644
--- a/src/components/TemplateDetailPage/TemplateDetailPage.container.ts
+++ b/src/components/TemplateDetailPage/TemplateDetailPage.container.ts
@@ -12,7 +12,7 @@ import { MapStateProps, MapDispatchProps, MapDispatch } from './TemplateDetailPa
 import TemplateDetailPage from './TemplateDetailPage'
 
 const mapState = (state: RootState): MapStateProps => {
-  const templateId = getTemplateId(state)
+  const templateId = getTemplateId()
   const template = templateId && getTemplates(state)[templateId]
   const scene = template ? getScenes(state)[template.sceneId] : null
   return {
diff --git a/src/components/ThirdPartyCollectionDetailPage/ThirdPartyCollectionDetailPage.container.ts b/src/components/ThirdPartyCollectionDetailPage/ThirdPartyCollectionDetailPage.container.ts
index 481381d3b..70f1d21f2 100644
--- a/src/components/ThirdPartyCollectionDetailPage/ThirdPartyCollectionDetailPage.container.ts
+++ b/src/components/ThirdPartyCollectionDetailPage/ThirdPartyCollectionDetailPage.container.ts
@@ -1,5 +1,4 @@
 import { connect } from 'react-redux'
-import { getLocation } from 'connected-react-router'
 import { isLoadingType } from 'decentraland-dapps/dist/modules/loading/selectors'
 import { getData as getWallet } from 'decentraland-dapps/dist/modules/wallet/selectors'
 import { getData as getAuthorizations } from 'decentraland-dapps/dist/modules/authorization/selectors'
@@ -18,12 +17,13 @@ import { getCollectionType } from 'modules/collection/utils'
 import { CollectionType } from 'modules/collection/types'
 
 const mapState = (state: RootState): MapStateProps => {
-  const collectionId = getCollectionId(state) || ''
+  const collectionId = getCollectionId() || ''
   const collection = getCollection(state, collectionId)
   const totalItems = getPaginationData(state, collectionId)?.total || null
   const items = collection ? getCollectionItems(state, collection.id) : []
   const paginatedData = (collection && getPaginationData(state, collection.id)) || null
-  const currentPage = Number(getLocation(state).query.page ?? 1)
+  const queryParams = new URLSearchParams(window.location.search)
+  const currentPage = Number(queryParams.get('page') ?? 1)
   return {
     items,
     totalItems,
diff --git a/src/modules/editor/selectors.spec.ts b/src/modules/editor/selectors.spec.ts
index a054e6772..a912ce638 100644
--- a/src/modules/editor/selectors.spec.ts
+++ b/src/modules/editor/selectors.spec.ts
@@ -1,4 +1,3 @@
-import { RouterState } from 'connected-react-router'
 import { BodyShape, WearableCategory } from '@dcl/schemas'
 import { RootState } from 'modules/common/types'
 import { ItemState } from 'modules/item/reducer'
@@ -9,16 +8,17 @@ import { INITIAL_STATE } from './reducer'
 import { getFetchingBaseWearablesError, getSelectedBaseWearablesByBodyShape, isLoadingBaseWearables, getVisibleItems } from './selectors'
 
 let state: RootState
-const routerState: RouterState = {
-  action: 'PUSH',
-  location: {
-    query: {},
-    pathname: '',
-    state: '',
-    hash: '',
-    search: ''
+const originalLocation = window.location
+
+beforeAll(() => {
+  window.location = {
+    ...originalLocation
   }
-}
+})
+
+afterAll(() => {
+  window.location = originalLocation
+})
 
 beforeEach(() => {
   state = {
@@ -151,7 +151,6 @@ describe('when getting the visible items', () => {
   beforeEach(() => {
     state = {
       ...state,
-      router: routerState,
       item: {
         data: {
           someId: { id: 'someId' } as Item,
@@ -171,7 +170,6 @@ describe('when getting the visible items', () => {
     beforeEach(() => {
       state = {
         ...state,
-        router: routerState,
         item: {
           data: {
             someId: { id: 'someId' } as Item
@@ -189,15 +187,9 @@ describe('when getting the visible items', () => {
   })
   describe('when the curator is reviewing a collection', () => {
     beforeEach(() => {
+      window.location.search = '?reviewing=true&collection=aCollection'
       state = {
         ...state,
-        router: {
-          ...routerState,
-          location: {
-            ...routerState.location,
-            search: '?reviewing=true&collection=aCollection'
-          }
-        },
         item: {
           data: {
             someId: { id: 'someId', collectionId: 'aCollection' } as Item,
diff --git a/src/modules/item/selectors.ts b/src/modules/item/selectors.ts
index 145b957e0..b37c166d4 100644
--- a/src/modules/item/selectors.ts
+++ b/src/modules/item/selectors.ts
@@ -20,7 +20,6 @@ import { DOWNLOAD_ITEM_REQUEST } from './actions'
 import { ItemState } from './reducer'
 import { Item, SyncStatus, BlockchainRarity, CatalystItem, ItemType, VIDEO_PATH } from './types'
 import { areSynced, canSeeItem, isOwner, isSmart } from './utils'
-import { getSearch } from 'connected-react-router'
 
 export const getState = (state: RootState) => state.item
 export const getData = (state: RootState) => getState(state).data
@@ -209,4 +208,4 @@ export const hasViewAndEditRights = (state: RootState, address: string, collecti
   )
 }
 
-export const getNewItemName = (state: RootState) => new URLSearchParams(getSearch(state)).get('newItem')
+export const getNewItemName = () => new URLSearchParams(window.location.search).get('newItem')
diff --git a/src/modules/location/selectors.spec.ts b/src/modules/location/selectors.spec.ts
index 9a784862a..b8a1b7b9f 100644
--- a/src/modules/location/selectors.spec.ts
+++ b/src/modules/location/selectors.spec.ts
@@ -7,36 +7,34 @@ import { getCollectionId, getSelectedItemId, getTemplateId, getENSName } from '.
 
 jest.mock('decentraland-dapps/dist/modules/wallet/selectors')
 
+const originalLocation = window.location
+
+beforeAll(() => {
+  window.location = {
+    ...originalLocation
+  }
+})
+
+afterAll(() => {
+  window.location = originalLocation
+})
+
 describe('when getting the collection id from the current url', () => {
   describe('when the collection is standard', () => {
     it('should return the collection id section of the url', () => {
       const collectionId = 'some-standard-collection-id'
-      const mockState = {
-        router: {
-          action: 'POP',
-          location: {
-            pathname: locations.collectionDetail(collectionId)
-          }
-        }
-      } as unknown
+      window.location.pathname = locations.collectionDetail(collectionId)
 
-      expect(getCollectionId(mockState as RootState)).toEqual(collectionId)
+      expect(getCollectionId()).toEqual(collectionId)
     })
   })
 
   describe('when the collection is third party', () => {
     it('should return the collection id section of the url', () => {
       const collectionId = 'some-thirdparty-collection-id'
-      const mockState = {
-        router: {
-          action: 'POP',
-          location: {
-            pathname: locations.thirdPartyCollectionDetail(collectionId)
-          }
-        }
-      } as unknown
+      window.location.pathname = locations.thirdPartyCollectionDetail(collectionId)
 
-      expect(getCollectionId(mockState as RootState)).toEqual(collectionId)
+      expect(getCollectionId()).toEqual(collectionId)
     })
   })
 })
@@ -44,52 +42,35 @@ describe('when getting the collection id from the current url', () => {
 describe('when getting the template id from the current url', () => {
   it('should return the template id section of the url', () => {
     const templateId = 'some-template-id'
-    const mockState = {
-      router: {
-        action: 'POP',
-        location: {
-          pathname: locations.templateDetail(templateId)
-        }
-      }
-    } as unknown
-
-    expect(getTemplateId(mockState as RootState)).toEqual(templateId)
+    window.location.pathname = locations.templateDetail(templateId)
+
+    expect(getTemplateId()).toEqual(templateId)
   })
 })
 
 describe('when getting the selected item id using the current url', () => {
   describe('and the url contains the item id', () => {
-    const itemId = 'some-item-id'
-    const mockState = {
-      router: {
-        action: 'POP',
-        location: {
-          pathname: locations.itemEditor({ itemId }),
-          search: {
-            item: itemId
-          }
-        }
-      }
-    } as unknown as RootState
+    let itemId: string
+    beforeEach(() => {
+      itemId = 'some-item-id'
+      window.location.pathname = locations.itemEditor({ itemId })
+      window.location.search = `?item=${itemId}`
+    })
 
     it('should return the item id of the url', () => {
-      expect(getSelectedItemId(mockState)).toEqual(itemId)
+      expect(getSelectedItemId({} as unknown as RootState)).toEqual(itemId)
     })
   })
 
   describe('and the url does not contain the item id', () => {
     describe('and the collection id is not in the url either', () => {
-      const mockState = {
-        router: {
-          action: 'POP',
-          location: {
-            pathname: locations.itemEditor({})
-          }
-        }
-      } as unknown as RootState
-
+      beforeEach(() => {
+        window.location.pathname = locations.itemEditor({})
+        window.location.search = ''
+      })
       it('should return null', () => {
-        expect(getSelectedItemId(mockState)).toEqual(null)
+        console.log(window.location.pathname)
+        expect(getSelectedItemId({} as unknown as RootState)).toEqual(null)
       })
     })
 
@@ -112,22 +93,14 @@ describe('when getting the selected item id using the current url', () => {
           collectionId
         } as Item
 
+        window.location.pathname = locations.itemEditor({ collectionId, isReviewing: 'true' })
+        window.location.search = `?collection=${collectionId}&reviewing=true`
         mockState = {
           collection: {
             data: {}
           },
           item: {
             data: {}
-          },
-          router: {
-            action: 'POP',
-            location: {
-              pathname: locations.itemEditor({ collectionId, isReviewing: 'true' }),
-              search: {
-                collection: collectionId,
-                reviewing: 'true'
-              }
-            }
           }
         } as unknown as RootState
         ;(getData as jest.MockedFunction<typeof getData>).mockReturnValueOnce({ address: 'some-address' } as Wallet)
@@ -328,15 +301,8 @@ describe('when getting the selected item id using the current url', () => {
 describe('when getting the name from the current url', () => {
   it('should return the name section of the url', () => {
     const name = 'test'
-    const mockState = {
-      router: {
-        action: 'POP',
-        location: {
-          pathname: locations.ensDetail(name)
-        }
-      }
-    } as unknown
-
-    expect(getENSName(mockState as RootState)).toEqual(name)
+    window.location.pathname = locations.ensDetail(name)
+
+    expect(getENSName()).toEqual(name)
   })
 })
diff --git a/src/modules/location/selectors.ts b/src/modules/location/selectors.ts
index 623f49c3d..1fa8c4b61 100644
--- a/src/modules/location/selectors.ts
+++ b/src/modules/location/selectors.ts
@@ -1,5 +1,5 @@
 import { locations } from 'routing/locations'
-import { createMatchSelector, getSearch } from 'connected-react-router'
+import { matchPath } from 'react-router-dom'
 import { RootState } from 'modules/common/types'
 import { getCollection } from 'modules/collection/selectors'
 import { getPaginatedCollectionItems } from 'modules/item/selectors'
@@ -7,91 +7,81 @@ import { getFirstWearableOrItem } from 'modules/item/utils'
 import { getCollectionType } from 'modules/collection/utils'
 import { CollectionType } from 'modules/collection/types'
 
-const landIdMatchSelector = createMatchSelector<
-  RootState,
-  {
-    landId: string
-  }
->(locations.landDetail())
+export function matchAppRoute<T extends Record<string, string>>(path: string, route: string) {
+  return matchPath<T>(path, { path: route, strict: true, exact: true })
+}
+
+function landIdMatchParams() {
+  return matchAppRoute<{ landId: string }>(window.location.pathname, locations.landDetail())?.params
+}
 
-export const getLandId = (state: RootState) => {
-  const result = landIdMatchSelector(state)
-  return result ? result.params.landId : null
+export const getLandId = () => {
+  const result = landIdMatchParams()
+  return result ? result.landId : null
 }
 
-const projectIdMatchSelector = createMatchSelector<
-  RootState,
-  {
-    projectId: string
-  }
->(locations.sceneDetail())
+function projectIdMatchParams() {
+  return matchAppRoute<{ projectId: string }>(window.location.pathname, locations.sceneDetail())?.params
+}
+
+export const getProjectId = () => {
+  const result = projectIdMatchParams()
+  return result ? result.projectId : null
+}
 
-export const getProjectId = (state: RootState) => {
-  const result = projectIdMatchSelector(state)
-  return result ? result.params.projectId : null
+function templateIdMatchParams() {
+  return matchAppRoute<{ templateId: string }>(window.location.pathname, locations.templateDetail())?.params
 }
 
-const templateIdMatchSelector = createMatchSelector<
-  RootState,
-  {
-    templateId: string
-  }
->(locations.templateDetail())
+export const getTemplateId = () => {
+  const result = templateIdMatchParams()
+  return result ? result.templateId : null
+}
 
-export const getTemplateId = (state: RootState) => {
-  const result = templateIdMatchSelector(state)
-  return result ? result.params.templateId : null
+function itemIdMatchParams() {
+  return matchAppRoute<{ itemId: string }>(window.location.pathname, locations.itemDetail())?.params
 }
 
-const itemIdMatchSelector = createMatchSelector<
-  RootState,
-  {
-    itemId: string
-  }
->(locations.itemDetail())
+export const getItemId = () => {
+  const result = itemIdMatchParams()
+  return result ? result.itemId : null
+}
 
-export const getItemId = (state: RootState) => {
-  const result = itemIdMatchSelector(state)
-  return result ? result.params.itemId : null
+function collectionIdMatchParams() {
+  return matchAppRoute<{ collectionId: string }>(window.location.pathname, locations.collectionDetail())?.params
 }
 
-const collectionIdMatchSelector = createMatchSelector<
-  RootState,
-  {
-    collectionId: string
-  }
->([locations.collectionDetail(), locations.thirdPartyCollectionDetail()])
+function thirdPartyCollectionIdMatchParams() {
+  return matchAppRoute<{ collectionId: string }>(window.location.pathname, locations.thirdPartyCollectionDetail())?.params
+}
 
-export const getCollectionId = (state: RootState) => {
-  const result = collectionIdMatchSelector(state)
-  return result ? result.params.collectionId : null
+export const getCollectionId = () => {
+  const result = collectionIdMatchParams() || thirdPartyCollectionIdMatchParams()
+  return result ? result.collectionId : null
 }
 
 export const getSelectedItemId = (state: RootState) => {
-  const selectedItemId = new URLSearchParams(getSearch(state)).get('item')
+  const selectedItemId = new URLSearchParams(window.location.search).get('item')
   if (selectedItemId) return selectedItemId
 
-  const collectionId = getSelectedCollectionId(state)
+  const collectionId = getSelectedCollectionId()
   if (!collectionId) return null
 
   const collection = getCollection(state, collectionId)
 
-  const isReviewingTPCollection = collection ? getCollectionType(collection) === CollectionType.THIRD_PARTY && isReviewing(state) : false
+  const isReviewingTPCollection = collection ? getCollectionType(collection) === CollectionType.THIRD_PARTY && isReviewing() : false
   const allItems = getPaginatedCollectionItems(state, collectionId)
   const items = isReviewingTPCollection ? allItems.filter(item => item.isPublished) : allItems
   return getFirstWearableOrItem(items)?.id ?? null
 }
-export const getSelectedCollectionId = (state: RootState) => new URLSearchParams(getSearch(state)).get('collection')
-export const isReviewing = (state: RootState) => !!new URLSearchParams(getSearch(state)).get('reviewing')
-
-export const ensNameMatchSelector = createMatchSelector<
-  RootState,
-  {
-    name: string
-  }
->(locations.ensDetail())
-
-export const getENSName = (state: RootState) => {
-  const result = ensNameMatchSelector(state)
-  return result ? result.params.name : null
+export const getSelectedCollectionId = () => new URLSearchParams(window.location.search).get('collection')
+export const isReviewing = () => !!new URLSearchParams(window.location.search).get('reviewing')
+
+function ensNameMatchParams() {
+  return matchAppRoute<{ name: string }>(window.location.pathname, locations.ensDetail())?.params
+}
+
+export const getENSName = () => {
+  const result = ensNameMatchParams()
+  return result ? result.name : null
 }
diff --git a/src/modules/pool/selectors.ts b/src/modules/pool/selectors.ts
index 3be65cfbd..e0e542adf 100644
--- a/src/modules/pool/selectors.ts
+++ b/src/modules/pool/selectors.ts
@@ -1,6 +1,5 @@
 import { createSelector } from 'reselect'
 import { isLoadingType } from 'decentraland-dapps/dist/modules/loading/selectors'
-import { getLocation } from 'connected-react-router'
 
 import * as routing from 'routing/utils'
 import { RootState } from 'modules/common/types'
@@ -65,46 +64,31 @@ export const isFetching = createSelector(
     isLoadingType(projectLoading, LOAD_POOLS_REQUEST)
 )
 
-export const getSearchGroup = createSelector(
-  (state: RootState) => getLocation(state),
-  location => {
-    const params = new URLSearchParams(location.search)
-    return routing.getValue(params.get('group')) as string | undefined
-  }
-)
-
-export const getSearchEthAddress = createSelector(
-  (state: RootState) => getLocation(state),
-  location => {
-    const params = new URLSearchParams(location.search)
-    return routing.getValue(params.get('eth_address')) as string | undefined
-  }
-)
-
-export const getPage = createSelector(
-  (state: RootState) => getLocation(state),
-  location => {
-    const params = new URLSearchParams(location.search)
-    return routing.getPage(params.get('page'), 1)
-  }
-)
-
-export const getSortBy = createSelector(
-  (state: RootState) => getLocation(state),
-  location => {
-    const params = new URLSearchParams(location.search)
-    return routing.getSortBy(
-      params.get('sort_by'),
-      [SortBy.NEWEST, SortBy.LIKES, SortBy.NAME, SortBy.SIZE, SortBy.ITEMS, SortBy.SMART_ITEMS],
-      SortBy.NEWEST
-    )
-  }
-)
-
-export const getSortOrder = createSelector(
-  (state: RootState) => getLocation(state),
-  location => {
-    const params = new URLSearchParams(location.search)
-    return routing.getSortOrder(params.get('sort_order'), 'desc')
-  }
-)
+export const getSearchGroup = () => {
+  const params = new URLSearchParams(window.location.search)
+  return routing.getValue(params.get('group')) as string | undefined
+}
+
+export const getSearchEthAddress = () => {
+  const params = new URLSearchParams(location.search)
+  return routing.getValue(params.get('eth_address')) as string | undefined
+}
+
+export const getPage = () => {
+  const params = new URLSearchParams(location.search)
+  return routing.getPage(params.get('page'), 1)
+}
+
+export const getSortBy = () => {
+  const params = new URLSearchParams(location.search)
+  return routing.getSortBy(
+    params.get('sort_by'),
+    [SortBy.NEWEST, SortBy.LIKES, SortBy.NAME, SortBy.SIZE, SortBy.ITEMS, SortBy.SMART_ITEMS],
+    SortBy.NEWEST
+  )
+}
+
+export const getSortOrder = () => {
+  const params = new URLSearchParams(location.search)
+  return routing.getSortOrder(params.get('sort_order'), 'desc')
+}
diff --git a/src/modules/ui/dashboard/selectors.ts b/src/modules/ui/dashboard/selectors.ts
index 797f5b8a9..2d816612f 100644
--- a/src/modules/ui/dashboard/selectors.ts
+++ b/src/modules/ui/dashboard/selectors.ts
@@ -1,6 +1,4 @@
 import { createSelector } from 'reselect'
-import { Location } from 'history'
-import { getLocation } from 'connected-react-router'
 import { DataByKey } from 'decentraland-dapps/dist/lib/types'
 import { RootState } from 'modules/common/types'
 import { getUserProjects } from 'modules/project/selectors'
@@ -23,40 +21,33 @@ export const getTotalPages = createSelector<RootState, DataByKey<Project>, numbe
   Math.max(Math.ceil(Object.keys(projects).length / PAGE_SIZE), 1)
 )
 
-export const getPage = createSelector<RootState, Location, number, number>(
-  state => getLocation<RootState>(state),
-  getTotalPages,
-  (location, totalPages) => {
-    const params = new URLSearchParams(location.search)
-    let page = parseInt(params.get('page')!, 10)
-    if (!page || page < 1) {
-      page = 1
-    }
-    if (page > totalPages) {
-      page = totalPages
-    }
-    return page
+export const getPage = createSelector<RootState, number, number>(getTotalPages, totalPages => {
+  const params = new URLSearchParams(window.location.search)
+  let page = parseInt(params.get('page') ?? '0', 10)
+  if (!page || page < 1) {
+    page = 1
   }
-)
+  if (page > totalPages) {
+    page = totalPages
+  }
+  return page
+})
 
-export const getSortBy = createSelector<RootState, Location, SortBy>(
-  state => getLocation<RootState>(state),
-  location => {
-    const params = new URLSearchParams(location.search)
-    let sortBy: SortBy = SortBy.NEWEST
-    for (const upperCaseType of Object.keys(SortBy)) {
-      let paramType = params.get('sort_by')
-      if (paramType) {
-        paramType = paramType.toLowerCase()
-        const type = upperCaseType.toLowerCase()
-        if (paramType === type) {
-          sortBy = type as SortBy
-        }
+export const getSortBy = () => {
+  const params = new URLSearchParams(window.location.search)
+  let sortBy: SortBy = SortBy.NEWEST
+  for (const upperCaseType of Object.keys(SortBy)) {
+    let paramType = params.get('sort_by')
+    if (paramType) {
+      paramType = paramType.toLowerCase()
+      const type = upperCaseType.toLowerCase()
+      if (paramType === type) {
+        sortBy = type as SortBy
       }
     }
-    return sortBy
   }
-)
+  return sortBy
+}
 
 export const getProjects = createSelector<RootState, number, SortBy, DataByKey<Project>, Project[]>(
   getPage,
diff --git a/src/tests/beforeSetupTests.ts b/src/tests/beforeSetupTests.ts
index bd63487b9..23ba3bae6 100644
--- a/src/tests/beforeSetupTests.ts
+++ b/src/tests/beforeSetupTests.ts
@@ -40,3 +40,16 @@ if (!globalThis.fetch) {
 }
 
 setCurrentLocale('en', mergeTranslations(flatten(dappsEn), flatten(locales.en)))
+
+Object.defineProperty(window, 'location', {
+  writable: true,
+  value: {
+    ...window.location,
+    assign: jest.fn(),
+    reload: jest.fn(),
+    replace: jest.fn(),
+    href: 'http://test.com/',
+    pathname: '/',
+    search: ''
+  }
+})