diff --git a/src/base/resolver/Query.svelte b/src/base/resolver/Query.svelte
index 8794c9e96..75ebe9e87 100644
--- a/src/base/resolver/Query.svelte
+++ b/src/base/resolver/Query.svelte
@@ -23,19 +23,14 @@
         // Go to Radicle project.
         navigate(`/projects/${query}`, { replace: true });
       } else {
-        let label = utils.parseEnsLabel(query, config);
-        if (label.includes(".")) {
-          error = true;
+        // Jump straight to org, if the ENS entry points to an org. Otherwise it checks if the
+        // address type is an EOA and jumps to the user page else it just goes to the registration.
+        const address = await utils.resolveLabel(query, config);
+        const addressType = address && await utils.identifyAddress(address, config);
+        if (addressType === utils.AddressType.Org || addressType === utils.AddressType.EOA) {
+          navigate(`/${address}`, { replace: true });
         } else {
-          // Jump straight to org, if the ENS entry points to an org. Otherwise it checks if the
-          // address type is an EOA and jumps to the user page else it just goes to the registration.
-          const address = await utils.resolveLabel(label, config);
-          const addressType = address && await utils.identifyAddress(address, config);
-          if (addressType === utils.AddressType.Org || addressType === utils.AddressType.EOA) {
-            navigate(`/${address}`, { replace: true });
-          } else {
-            navigate(`/registrations/${label}`, { replace: true });
-          }
+          navigate(`/registrations/${query}`, { replace: true });
         }
       }
     } else {
diff --git a/src/utils.ts b/src/utils.ts
index 2a908a0ee..c4ec3fb52 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -312,7 +312,7 @@ export async function identifyAddress(address: string, config: Config): Promise<
 
 // Resolve a label under the radicle domain.
 export async function resolveLabel(label: string | undefined, config: Config): Promise<string | null> {
-  if (label) return config.provider.resolveName(`${label}.${config.registrar.domain}`);
+  if (label) return config.provider.resolveName(`${label}`);
   return null;
 }