diff --git a/minter/src/App.js b/minter/src/App.js
index f25ed14..6845de4 100644
--- a/minter/src/App.js
+++ b/minter/src/App.js
@@ -7,8 +7,8 @@ import { Container } from './components/generic'
 import { useState, useEffect } from 'react'
 import { log } from './modules/helpers'
 import { useAddress, getAddress } from './modules/web3'
-import { HashRouter, Routes, Route } from 'react-router-dom'
-
+import { HashRouter} from 'react-router-dom'
+import Router from './components/router'
 
 function App() {
 
@@ -34,17 +34,7 @@ function App() {
 	</Container>
 	return <HashRouter>
 		
-		<Routes>
-			
-			<Route exact path='/' element={ <Metamask /> } />
-			<Route exact path='/mint' element={ <Minter /> } />
-			<Route path='/verify/' element={ <Verifier /> }>
-				<Route path='/verify/:verificationCode' element={ <Verifier /> } />
-			</Route>
-			<Route exact path='/avatar' element={ <Avatar /> } />
-			<Route exact path='/portfolio' element={ <Portfolio /> } />
-
-		</Routes>
+		<Router />
 
 	</HashRouter>
 
diff --git a/minter/src/components/router.js b/minter/src/components/router.js
new file mode 100644
index 0000000..100b507
--- /dev/null
+++ b/minter/src/components/router.js
@@ -0,0 +1,45 @@
+import Minter from './minter'
+import Metamask from './metamask'
+import Verifier from './verifier'
+import Avatar from './avatar'
+import Portfolio from './portfolio'
+import { Container } from './generic'
+import { useState, useEffect } from 'react'
+import { log } from '../modules/helpers'
+import { useAddress, getAddress } from '../modules/web3'
+import { Routes, Route, useNavigate } from 'react-router-dom'
+
+
+function Router() {
+
+	// ///////////////////////////////
+	// States
+	// ///////////////////////////////
+	const address = useAddress()
+	const navigate = useNavigate()
+	// ///////////////////////////////
+	// Lifecycle
+	// ///////////////////////////////
+	useEffect( f => {
+		log( 'Address change' )
+		if( !address ) navigate( '/' )
+	}, [ address, navigate ] )
+
+	// ///////////////////////////////
+	// Rendering
+	// ///////////////////////////////
+	return <Routes>
+			
+		<Route exact path='/' element={ <Metamask /> } />
+		<Route exact path='/mint' element={ <Minter /> } />
+		<Route path='/verify/' element={ <Verifier /> }>
+			<Route path='/verify/:verificationCode' element={ <Verifier /> } />
+		</Route>
+		<Route exact path='/avatar' element={ <Avatar /> } />
+		<Route exact path='/portfolio' element={ <Portfolio /> } />
+
+	</Routes>
+
+}
+
+export default Router;