diff --git a/src/base/orgs/List.svelte b/src/base/orgs/List.svelte
index deff402a1..e70b0a256 100644
--- a/src/base/orgs/List.svelte
+++ b/src/base/orgs/List.svelte
@@ -61,7 +61,7 @@
   <div class="list">
     {#each profiles as profile}
       <div class="org">
-        <Link to={`/orgs/${profile.address}`}>
+        <Link to={`/orgs/${profile.nameOrAddress}`}>
           <div class="org-avatar">
             <Avatar source={profile.avatar ?? profile.address} />
           </div>
diff --git a/src/base/orgs/View.svelte b/src/base/orgs/View.svelte
index 4decebca4..0f7ab1edd 100644
--- a/src/base/orgs/View.svelte
+++ b/src/base/orgs/View.svelte
@@ -252,7 +252,7 @@
           {:then projects}
             {#each projects as project}
               <div class="project">
-                <Project {project} org={profile.name ?? org.address} config={profile.config(config)} />
+                <Project {project} org={profile.nameOrAddress} config={profile.config(config)} />
               </div>
             {/each}
           {:catch err}
diff --git a/src/base/projects/View.svelte b/src/base/projects/View.svelte
index e77e3dd6a..5cf6c7429 100644
--- a/src/base/projects/View.svelte
+++ b/src/base/projects/View.svelte
@@ -86,7 +86,7 @@
     <header>
       <div class="title bold">
         {#if result.org}
-          <a class="org-avatar" title={result.org.name || result.org.address} href={`/orgs/${org}`}>
+          <a class="org-avatar" title={result.org.nameOrAddress} href={`/orgs/${result.org.nameOrAddress}`}>
             <Avatar source={result.org.avatar || org}/>
           </a>
           <span class="divider">/</span>
diff --git a/src/profile.ts b/src/profile.ts
index f07948338..994a04295 100644
--- a/src/profile.ts
+++ b/src/profile.ts
@@ -79,6 +79,11 @@ export class Profile {
     return this.profile?.ens?.seedHost ?? undefined;
   }
 
+  // Get the name, and if not available, the address.
+  get nameOrAddress(): string {
+    return this.name ?? this.address;
+  }
+
   // Return the profile-specific config. This sets various URLs in the config,
   // based on profile data.
   config(config: Config): Config {