diff --git a/packages/marketplace_server/src/utils/resolveUrl/index.js b/packages/marketplace_server/src/utils/resolveUrl/index.js
index 0afb2a90..a9a33785 100644
--- a/packages/marketplace_server/src/utils/resolveUrl/index.js
+++ b/packages/marketplace_server/src/utils/resolveUrl/index.js
@@ -2,7 +2,16 @@ export default (from, to) => {
     const resolvedUrl = new URL(to, new URL(from, "resolve://"))
 
     if (resolvedUrl.protocol === "resolve:") {
-        const { pathname, search, hash } = resolvedUrl
+        let { pathname, search, hash } = resolvedUrl
+
+        if (to.includes("@")) {
+            const fromUrl = new URL(from)
+            const toUrl = new URL(to, fromUrl.origin)
+
+            pathname = toUrl.pathname
+            search = toUrl.search
+            hash = toUrl.hash
+        }
 
         return pathname + search + hash
     }