diff --git a/src/modules/nostr-feed/components/ScheduledEventCard.vue b/src/modules/nostr-feed/components/ScheduledEventCard.vue
index 51c8102..3abb133 100644
--- a/src/modules/nostr-feed/components/ScheduledEventCard.vue
+++ b/src/modules/nostr-feed/components/ScheduledEventCard.vue
@@ -74,9 +74,11 @@ const completion = computed(() => props.getCompletion(eventAddress.value, occurr
 // Get current user's pubkey
 const currentUserPubkey = computed(() => authService?.user.value?.pubkey)
 
-// Check if current user can unclaim (only if they created the current status)
+// Check if current user can unclaim
+// Only show unclaim for "claimed" state, and only if current user is the one who claimed it
 const canUnclaim = computed(() => {
   if (!completion.value || !currentUserPubkey.value) return false
+  if (taskStatus.value !== 'claimed') return false
   return completion.value.pubkey === currentUserPubkey.value
 })