diff --git a/src/components/feeds/messages/CommunityMessage.js b/src/components/feeds/messages/CommunityMessage.js
index 1005b47..460a867 100644
--- a/src/components/feeds/messages/CommunityMessage.js
+++ b/src/components/feeds/messages/CommunityMessage.js
@@ -91,10 +91,15 @@ const CommunityMessage = ({ message, searchQuery, windowWidth, platform }) => {
                                 {nsec || npub ? (
                                     <ZapThreadsWrapper
                                         anchor={nip19.noteEncode(message.id)}
-                                        user={nsec || npub || null}
+                                        user={nsec || npub}
                                         relays="wss://nos.lol/, wss://relay.damus.io/, wss://relay.snort.social/, wss://relay.nostr.band/, wss://relay.mutinywallet.com/, wss://relay.primal.net/, wss://nostr21.com/, wss://nostrue.com/, wss://purplerelay.com/, wss://relay.devs.tools/"
                                     />
-                                ) : null}
+                                ) : (
+                                    <ZapThreadsWrapper
+                                        anchor={nip19.noteEncode(message.id)}
+                                        relays="wss://nos.lol/, wss://relay.damus.io/, wss://relay.snort.social/, wss://relay.nostr.band/, wss://relay.mutinywallet.com/, wss://relay.primal.net/, wss://nostr21.com/, wss://nostrue.com/, wss://purplerelay.com/, wss://relay.devs.tools/"
+                                    />
+                                )}
                             </div>
                         </Panel>
                     ) : (
diff --git a/src/pages/details/[slug]/index.js b/src/pages/details/[slug]/index.js
index 886d75c..afd9c35 100644
--- a/src/pages/details/[slug]/index.js
+++ b/src/pages/details/[slug]/index.js
@@ -178,7 +178,7 @@ const Details = () => {
                 handlePaymentError={handlePaymentError}
                 authorView={authorView}
             />
-            {nAddress !== null && (nsec || npub) && (
+            {nAddress !== null && (nsec || npub) ? (
                 <div className='px-4'>
                     <ZapThreadsWrapper
                         anchor={nAddress}
@@ -187,7 +187,16 @@ const Details = () => {
                         disable="zaps"
                     />
                 </div>
-            )}
+            ) : nAddress !== null ? (
+                <div className='px-4'>
+                    <ZapThreadsWrapper
+                        anchor={nAddress}
+                        user={npub}
+                        relays="wss://nos.lol/, wss://relay.damus.io/, wss://relay.snort.social/, wss://relay.nostr.band/, wss://relay.mutinywallet.com/, wss://relay.primal.net/, wss://nostr21.com/, wss://nostrue.com/, wss://purplerelay.com/, wss://relay.devs.tools/"
+                        disable="zaps"
+                    />
+                </div>
+            ) : null}
         </>
     );
 };