diff --git a/web/src/features/social/subscribe-button.tsx b/web/src/features/social/subscribe-button.tsx
index 9c655dcc..bbe96976 100644
--- a/web/src/features/social/subscribe-button.tsx
+++ b/web/src/features/social/subscribe-button.tsx
@@ -12,7 +12,7 @@ interface SubscribeButtonProps {
 
 export function SubscribeButton({ skillId, subscriptionCount, onRequireLogin }: SubscribeButtonProps) {
   const { t } = useTranslation()
-  const { data: subscriptionStatus, isLoading } = useSubscription(skillId)
+  const { data: subscriptionStatus } = useSubscription(skillId)
   const toggleMutation = useToggleSubscription(skillId)
   const { isAuthenticated } = useAuth()
 
@@ -26,7 +26,7 @@ export function SubscribeButton({ skillId, subscriptionCount, onRequireLogin }:
     }
   }
 
-  if (isLoading || !subscriptionStatus) {
+  if (!subscriptionStatus) {
     return null
   }
 
diff --git a/web/src/features/social/use-subscription.ts b/web/src/features/social/use-subscription.ts
index 8d91b563..9a6b3637 100644
--- a/web/src/features/social/use-subscription.ts
+++ b/web/src/features/social/use-subscription.ts
@@ -44,7 +44,21 @@ export function useToggleSubscription(skillId: number) {
 
   return useMutation({
     mutationFn: (subscribed: boolean) => toggleSubscription(skillId, subscribed),
-    onSuccess: () => {
+    onMutate: async (currentSubscribed: boolean) => {
+      await queryClient.cancelQueries({ queryKey: ['skills', skillId, 'subscription'] })
+      const previous = queryClient.getQueryData<SubscriptionStatus>(['skills', skillId, 'subscription'])
+      queryClient.setQueryData<SubscriptionStatus>(
+        ['skills', skillId, 'subscription'],
+        { subscribed: !currentSubscribed },
+      )
+      return { previous }
+    },
+    onError: (_error, _variables, context) => {
+      if (context?.previous !== undefined) {
+        queryClient.setQueryData(['skills', skillId, 'subscription'], context.previous)
+      }
+    },
+    onSettled: () => {
       queryClient.invalidateQueries({ queryKey: ['skills', skillId, 'subscription'] })
       queryClient.invalidateQueries({ queryKey: ['skills'] })
       queryClient.invalidateQueries({ queryKey: ['skills', 'subscriptions'] })
diff --git a/web/src/pages/skill-detail.tsx b/web/src/pages/skill-detail.tsx
index 7439241e..14ecee44 100644
--- a/web/src/pages/skill-detail.tsx
+++ b/web/src/pages/skill-detail.tsx
@@ -1070,6 +1070,7 @@ export function SkillDetailPage() {
                 {!isFetchingSkill ? (
                   <>
                     <StarButton skillId={skill.id} starCount={skill.starCount} onRequireLogin={requireLogin} />
+                    <div className="h-px bg-border/40" />
                     <SubscribeButton skillId={skill.id} subscriptionCount={(skill as { subscriptionCount?: number }).subscriptionCount ?? 0} onRequireLogin={requireLogin} />
                     <RatingInput skillId={skill.id} onRequireLogin={requireLogin} />
                   </>