diff --git a/frontend/src/middleware/collection.ts b/frontend/src/middleware/collection.ts
index d023b870efd..773dcdd257a 100644
--- a/frontend/src/middleware/collection.ts
+++ b/frontend/src/middleware/collection.ts
@@ -26,13 +26,17 @@ const queryToCollectionParams = (
       collection: "tag",
       tag: query.tag,
     } as TagCollection
-  } else if ("creator" in query && "source" in query) {
+  }
+
+  if ("creator" in query && "source" in query) {
     return {
       collection: "creator",
       creator: query.creator,
       source: query.source,
     } as CreatorCollection
-  } else if ("source" in query) {
+  }
+
+  if ("source" in query) {
     return {
       collection: "source",
       source: query.source,