diff --git a/packages/api/src/handlers/queues.ts b/packages/api/src/handlers/queues.ts
index c0ecc7060..f1fbc90fc 100644
--- a/packages/api/src/handlers/queues.ts
+++ b/packages/api/src/handlers/queues.ts
@@ -95,7 +95,9 @@ async function getAppQueues(
 ): Promise<AppQueue[]> {
   return Promise.all(
     pairs.map(async ([queueName, queue]) => {
-      const isActiveQueue = query.activeQueue === queueName;
+      const isActiveQueue = decodeURIComponent(query.activeQueue) === queueName;
+      console.log({ isActiveQueue }, queueName);
+      console.log({ status: query.status });
 
       const status =
         !isActiveQueue || query.status === 'latest' ? allStatuses : [query.status as JobStatus];
diff --git a/packages/ui/src/hooks/useActiveQueue.ts b/packages/ui/src/hooks/useActiveQueue.ts
index 9a23b7afc..05f8ef0b7 100644
--- a/packages/ui/src/hooks/useActiveQueue.ts
+++ b/packages/ui/src/hooks/useActiveQueue.ts
@@ -9,5 +9,5 @@ export function useActiveQueue(): string | undefined {
     strict: true,
   });
 
-  return match?.params.name;
+  return decodeURIComponent(match?.params.name || '') || undefined;
 }