diff --git a/src/components/Modals/WorldsYourStorageModal/WorldsYourStorageModal.tsx b/src/components/Modals/WorldsYourStorageModal/WorldsYourStorageModal.tsx
index acae1848f..6787f3163 100644
--- a/src/components/Modals/WorldsYourStorageModal/WorldsYourStorageModal.tsx
+++ b/src/components/Modals/WorldsYourStorageModal/WorldsYourStorageModal.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { Link } from 'react-router-dom'
 import { Button, ModalContent, ModalNavigation } from 'decentraland-ui'
 import Modal from 'decentraland-dapps/dist/containers/Modal'
 import { t } from 'decentraland-dapps/dist/modules/translation/utils'
@@ -131,8 +132,8 @@ export default class WorldsYourStorageModal extends React.PureComponent<Props, S
             </div>
             <div>
               <Button
-                as="a"
-                href={locations.claimENS()}
+                as={Link}
+                to={locations.claimENS()}
                 primary
                 target="_blank"
                 rel="noopener noreferrer"
diff --git a/src/components/Preview/Preview.tsx b/src/components/Preview/Preview.tsx
index 812939881..33318a6a6 100644
--- a/src/components/Preview/Preview.tsx
+++ b/src/components/Preview/Preview.tsx
@@ -2,6 +2,7 @@ import * as React from 'react'
 import { DropTarget } from 'react-dnd'
 import Lottie from 'lottie-react'
 import { config } from 'config'
+import { Link } from 'react-router-dom'
 
 import { t } from 'decentraland-dapps/dist/modules/translation/utils'
 import Modal from 'decentraland-dapps/dist/containers/Modal'
@@ -125,10 +126,10 @@ class Preview extends React.Component<Props & CollectedProps> {
       <Modal name="SceneEditorErrorModal" size="tiny">
         <Modal.Content>{t('editor_preview.loading_unity_error', { br: <br /> })}</Modal.Content>
         <Modal.Actions>
-          <Button secondary as="a" href={locations.sceneDetail(project.id)}>
+          <Button secondary as={Link} to={locations.sceneDetail(project.id)}>
             {t('global.back')}
           </Button>
-          <Button primary as="a" href={locations.sceneEditor(project.id)}>
+          <Button primary as={Link} to={locations.sceneEditor(project.id)}>
             {t('global.reload')}
           </Button>
         </Modal.Actions>