diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index a1ce46c3..b3271baf 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -25,8 +25,12 @@ export function ButtonRoot({
       content={children}
       data-value={value}
     />,
-    <meta property={`fc:frame:button:${index}:action`} content={action} />,
-    <meta property={`fc:frame:button:${index}:target`} content={target} />,
+    action !== 'post' && (
+      <meta property={`fc:frame:button:${index}:action`} content={action} />
+    ),
+    target && (
+      <meta property={`fc:frame:button:${index}:target`} content={target} />
+    ),
   ] as unknown as HtmlEscapedString
 }
 
diff --git a/src/utils/getIntentState.ts b/src/utils/getIntentState.ts
index 41af098a..acfd3ce6 100644
--- a/src/utils/getIntentState.ts
+++ b/src/utils/getIntentState.ts
@@ -11,7 +11,7 @@ export function getIntentState(
   if (!intents) return state
   if (buttonIndex) {
     const buttonIntents = intents.filter((intent) =>
-      intent?.props.property.match(/fc:frame:button:\d$/),
+      intent?.props?.property?.match(/fc:frame:button:\d$/),
     )
     const intent = buttonIntents[buttonIndex - 1]
     state.buttonValue = intent.props['data-value']