diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts
index f51d7f9e9..8b66862fc 100644
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -103,7 +103,8 @@ export class StateService {
   }
 
   setNetworkBasedonUrl(url: string) {
-    switch (url.split(/\/|\?|#/)[1]) {
+    const networkMatches = url.match(/\/(bisq|testnet|liquid)/);
+    switch (networkMatches && networkMatches[1]) {
       case 'liquid':
         if (this.network !== 'liquid') {
           this.network = 'liquid';