diff --git a/apps/remix-ide/src/404.html b/apps/remix-ide/src/404.html
index f0cefda8bb..28214dc776 100644
--- a/apps/remix-ide/src/404.html
+++ b/apps/remix-ide/src/404.html
@@ -7,9 +7,9 @@
   <script>
     let route = window.location.pathname
     if (route.startsWith('/address/0x') && route.length === 51) {
-      window.location.href = '/#/#address=' + route.replace('/address/', '')
+      window.location.href = '/#/address=' + route.replace('/address/', '')
     } else if (route.endsWith('.sol')) {
-      window.location.href = '/#/#url=https://github.com' + route 
+      window.location.href = '/#/url=https://github.com' + route 
     } else window.location.href = '/' 
   </script>
 </html>
\ No newline at end of file
diff --git a/libs/remix-lib/src/query-params.ts b/libs/remix-lib/src/query-params.ts
index 41374be3bf..be3d2a876f 100644
--- a/libs/remix-lib/src/query-params.ts
+++ b/libs/remix-lib/src/query-params.ts
@@ -18,7 +18,7 @@ export class QueryParams  {
 
   get () {
     let qs 
-    if (window.location.hash.startsWith('#/#')) qs = window.location.hash.substr(3)
+    if (window.location.hash.startsWith('#/')) qs = window.location.hash.substr(2)
     else qs = window.location.hash.substr(1)
 
     if (window.location.search.length > 0) {