diff --git a/src/components/PeopleList/PeopleList.tsx b/src/components/PeopleList/PeopleList.tsx
index 0ae95b4..f58c547 100644
--- a/src/components/PeopleList/PeopleList.tsx
+++ b/src/components/PeopleList/PeopleList.tsx
@@ -47,7 +47,7 @@ const PeopleList: Component<{ people: PrimalUser[], label: string, id?: string }
                     {truncateNpub(person?.npub)}
                   </div>
                 </div>
-                <Show when={account?.publicKey !== person.pubkey}>
+                <Show when={account?.publicKey !== person.pubkey || !account?.following.includes(person.pubkey)}>
                   <FollowButton person={person} />
                 </Show>
               </A>
diff --git a/src/components/ProfileContact/ProfileContact.module.scss b/src/components/ProfileContact/ProfileContact.module.scss
index e5e920c..4cc0902 100644
--- a/src/components/ProfileContact/ProfileContact.module.scss
+++ b/src/components/ProfileContact/ProfileContact.module.scss
@@ -75,3 +75,7 @@
     }
   }
 }
+
+.placeholderDiv {
+  width: 72px;
+}
diff --git a/src/components/ProfileContact/ProfileContact.tsx b/src/components/ProfileContact/ProfileContact.tsx
index 37300d3..5393586 100644
--- a/src/components/ProfileContact/ProfileContact.tsx
+++ b/src/components/ProfileContact/ProfileContact.tsx
@@ -59,7 +59,10 @@ const ProfileContact: Component<{
             </div>
           </div>
         </Show>
-        <Show when={account?.publicKey !== props.profile?.pubkey}>
+        <Show
+          when={account?.publicKey !== props.profile?.pubkey || !account?.following.includes(props.profile?.pubkey || '')}
+          fallback={<div class={styles.placeholderDiv}></div>}
+        >
           <FollowButton person={props.profile} postAction={props.postAction} />
         </Show>
       </div>
diff --git a/src/pages/Profile.tsx b/src/pages/Profile.tsx
index 1fd1eb6..2d37ce2 100644
--- a/src/pages/Profile.tsx
+++ b/src/pages/Profile.tsx
@@ -603,7 +603,7 @@ const Profile: Component = () => {
             </ButtonSecondary>
           </Show>
 
-          <Show when={account?.publicKey !== profile?.profileKey}>
+          <Show when={!isCurrentUser() || !account?.following.includes(profile?.profileKey || '')}>
             <FollowButton person={profile?.userProfile} large={true} />
           </Show>