diff --git a/packages/webamp-modern-2/src/utils.ts b/packages/webamp-modern-2/src/utils.ts
index 5e0918fb..35b1fd2c 100644
--- a/packages/webamp-modern-2/src/utils.ts
+++ b/packages/webamp-modern-2/src/utils.ts
@@ -82,16 +82,7 @@ export function findLast<T>(
 
 
 export function getUrlQuery(location:Location, variable:string):string {
-  var query = location.search.substring(1);
-  var vars = query.split('&');
-  for (var i = 0; i < vars.length; i++) {
-      var pair = vars[i].split('=');
-      if (decodeURIComponent(pair[0]) == variable) {
-          return decodeURIComponent(pair[1]);
-      }
-  }
-  console.log('Query variable %s not found', variable);
-  return null;
+  return new URL(location.href).searchParams.get(variable)
 }
 
 export class Emitter {