diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index 7b79778e..255d455d 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -8,7 +8,7 @@ const { account, command, context, ...props } = defineProps<{
   command?: boolean
 }>()
 
-const isSelf = $computed(() => currentUser.value?.account.id === account.id)
+const isSelf = $(useSelfAccount(() => account))
 const enable = $computed(() => !isSelf && currentUser.value)
 const relationship = $computed(() => props.relationship || useRelationship(account).value)
 
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index cddc3c3b..8de0605c 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -75,7 +75,7 @@ watchEffect(() => {
   iconFields.value = icons
 })
 
-const isSelf = $computed(() => currentUser.value?.account.id === account.id)
+const isSelf = $(useSelfAccount(() => account))
 </script>
 
 <template>
diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index d4dc271a..7cf084db 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -7,7 +7,7 @@ const { account } = defineProps<{
 }>()
 let relationship = $(useRelationship(account))
 
-const isSelf = $computed(() => currentUser.value?.account.id === account.id)
+const isSelf = $(useSelfAccount(() => account))
 
 const masto = useMasto()
 const toggleMute = async () => {