diff --git a/packages/app/src/pages/@[username]/index.jsx b/packages/app/src/pages/@[username]/index.jsx
deleted file mode 100755
index 77df7de4..00000000
--- a/packages/app/src/pages/@[username]/index.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from "react"
-import Account from "../account"
-
-export default (props) => {
-    const username = props.match.params.username
-
-    return <Account username={username} />
-}
\ No newline at end of file
diff --git a/packages/app/src/pages/[param].jsx b/packages/app/src/pages/[param].jsx
new file mode 100755
index 00000000..29814d1d
--- /dev/null
+++ b/packages/app/src/pages/[param].jsx
@@ -0,0 +1,17 @@
+import React from "react"
+
+export default (props) => {
+    const entryParam = props.params.param
+
+    if (entryParam.startsWith("@")) {
+        const username = entryParam.replace("@", "")
+
+        window.app.setLocation(`/account/${username}`, {
+            state: {
+                "noTransition": true,
+            }
+        })
+    }
+
+    return <div />
+}
\ No newline at end of file
diff --git a/packages/app/src/pages/account/[username].jsx b/packages/app/src/pages/account/[username].jsx
index e3faa14d..78a391e1 100755
--- a/packages/app/src/pages/account/[username].jsx
+++ b/packages/app/src/pages/account/[username].jsx
@@ -2,7 +2,7 @@ import React from "react"
 import Account from "."
 
 export default (props) => {
-    const username = props.match.params.username
+    const username = props.params.username
 
     return <Account username={username} />
 }
\ No newline at end of file
diff --git a/packages/app/src/pages/account/index.jsx b/packages/app/src/pages/account/index.jsx
index 10a3d565..30c1d1d4 100755
--- a/packages/app/src/pages/account/index.jsx
+++ b/packages/app/src/pages/account/index.jsx
@@ -146,7 +146,9 @@ export default class Account extends React.Component {
 	}
 
 	componentWillUnmount = () => {
-		this.coverIntersectionObserver.disconnect()
+		if (this.coverIntersectionObserver) {
+			this.coverIntersectionObserver.disconnect()
+		}
 	}
 
 	fetchData = async (username) => {
@@ -231,7 +233,7 @@ export default class Account extends React.Component {
 			}
 
 			<div className="panels">
-				<div 
+				<div
 					className="leftPanel"
 					ref={this.leftPanelRef}
 				>
@@ -239,7 +241,7 @@ export default class Account extends React.Component {
 						user={user}
 					/>
 
-					<div 
+					<div
 						className="actions"
 						ref={this.actionsRef}
 					>
diff --git a/packages/app/src/pages/home/[type].jsx b/packages/app/src/pages/home/[type].jsx
index 177347d3..6413503c 100755
--- a/packages/app/src/pages/home/[type].jsx
+++ b/packages/app/src/pages/home/[type].jsx
@@ -13,7 +13,7 @@ import "./index.less"
 
 export default class Dashboard extends React.Component {
     state = {
-        activeTab: this.props.match.params.type ?? "feed"
+        activeTab: this.props.params.type ?? "feed"
     }
 
     primaryPanelRef = React.createRef()
diff --git a/packages/app/src/pages/home/[type].mobile.jsx b/packages/app/src/pages/home/[type].mobile.jsx
index 3ed1cbf9..1a3e7f45 100644
--- a/packages/app/src/pages/home/[type].mobile.jsx
+++ b/packages/app/src/pages/home/[type].mobile.jsx
@@ -8,7 +8,7 @@ import "./index.less"
 
 export default class Dashboard extends React.Component {
     state = {
-        activeTab: this.props.match.params.type ?? "feed"
+        activeTab: this.props.params.type ?? "feed"
     }
 
     primaryPanelRef = React.createRef()
diff --git a/packages/app/src/pages/home/index.jsx b/packages/app/src/pages/home/index.jsx
index 0c9a5808..ad7cbda3 100644
--- a/packages/app/src/pages/home/index.jsx
+++ b/packages/app/src/pages/home/index.jsx
@@ -1,7 +1,9 @@
 import React from "react"
 
 export default () => {
-    app.setLocation("/home/feed")
+    app.setLocation("/home/feed", {
+        "noTransition": true,
+    })
 
     return <></>
 }
\ No newline at end of file
diff --git a/packages/app/src/pages/index.jsx b/packages/app/src/pages/index.jsx
old mode 100755
new mode 100644
diff --git a/packages/app/src/pages/live/[key].jsx b/packages/app/src/pages/live/[key].jsx
index 3c0ce68c..6b51c68e 100755
--- a/packages/app/src/pages/live/[key].jsx
+++ b/packages/app/src/pages/live/[key].jsx
@@ -192,7 +192,7 @@ export default class StreamViewer extends React.Component {
     componentDidMount = async () => {
         this.enterPlayerAnimation()
 
-        const requestedUsername = this.props.match.params.key
+        const requestedUsername = this.props.params.key
 
         await this.setState({
             requestedUsername,
diff --git a/packages/app/src/pages/music/[type].jsx b/packages/app/src/pages/music/[type].jsx
index 85c7e516..4fe4eb11 100644
--- a/packages/app/src/pages/music/[type].jsx
+++ b/packages/app/src/pages/music/[type].jsx
@@ -10,7 +10,7 @@ import "./index.less"
 
 export default class MusicDashboard extends React.Component {
     state = {
-        activeTab: this.props.match.params.type ?? "feed"
+        activeTab: this.props.params.type ?? "feed"
     }
 
     primaryPanelRef = React.createRef()
diff --git a/packages/app/src/pages/tv/[type].jsx b/packages/app/src/pages/tv/[type].jsx
index 709efe9c..b8c26c1f 100644
--- a/packages/app/src/pages/tv/[type].jsx
+++ b/packages/app/src/pages/tv/[type].jsx
@@ -10,7 +10,7 @@ import "./index.less"
 
 export default class TVDashboard extends React.Component {
     state = {
-        activeTab: this.props.match.params.type ?? "feed"
+        activeTab: this.props.params.type ?? "feed"
     }
 
     primaryPanelRef = React.createRef()