diff --git a/packages/atlas/src/components/_comments/Comment/InternalComment.tsx b/packages/atlas/src/components/_comments/Comment/InternalComment.tsx
index cec6e9e9fa..c9ba62879a 100644
--- a/packages/atlas/src/components/_comments/Comment/InternalComment.tsx
+++ b/packages/atlas/src/components/_comments/Comment/InternalComment.tsx
@@ -98,7 +98,6 @@ export const InternalComment: FC<InternalCommentProps> = ({
   onEditClick,
   onDeleteClick,
   onReactionClick,
-  onOnBoardingPopoverOpen,
   reactions,
   onReplyClick,
   replyAvatars,
@@ -169,15 +168,13 @@ export const InternalComment: FC<InternalCommentProps> = ({
 
   const handleCommentReactionClick = useCallback(
     async (reactionId: CommentReaction) => {
+      onReactionClick?.(reactionId)
+
       if (!reactionPopoverDismissed) {
-        setTempReactionId(reactionId)
-        await onOnBoardingPopoverOpen?.(reactionId)
         popoverRef.current?.show()
-      } else {
-        onReactionClick?.(reactionId)
       }
     },
-    [onOnBoardingPopoverOpen, onReactionClick, reactionPopoverDismissed]
+    [onReactionClick, reactionPopoverDismissed]
   )
 
   const sortedReactions = reactions && [...reactions].sort((a, b) => (b.count || 0) - (a.count || 0))
diff --git a/packages/atlas/src/providers/transactions/transactions.hooks.ts b/packages/atlas/src/providers/transactions/transactions.hooks.ts
index 2ed5db69d2..b06e1f75a4 100644
--- a/packages/atlas/src/providers/transactions/transactions.hooks.ts
+++ b/packages/atlas/src/providers/transactions/transactions.hooks.ts
@@ -87,7 +87,7 @@ export const useTransaction = (): HandleTransactionFn => {
         return false
       }
 
-      if (isSignerMetadataOutdated && WALLETS_WITH_METADATA.includes(wallet?.extensionName ?? '')) {
+      if (isSignerMetadataOutdated && wallet?.extensionName && WALLETS_WITH_METADATA.includes(wallet.extensionName)) {
         await new Promise((resolve) => {
           openOngoingTransactionModal({
             title: 'Update Wallet Metadata',