                       :avatar-url (:avatar-url msg)
                       :team-id (:team-id org)} ;; Let's read the team-id from the org to avoid problems on multiple org users
         id-token (jwt/generate-id-token token-claims config/passphrase)
-        base-url (if (seq interaction-id)
-                   (s/join "/" [origin-url org-slug board-slug "post" uuid "comment" interaction-id])
-                   (s/join "/" [origin-url org-slug board-slug "post" uuid]))
-        entry-url (str base-url "?id=" id-token)
+        url-parts (cond-> [origin-url org-url-part]
+                    board-url-part (conj board-url-part)
+                    entry-uuid (concat ["post" entry-uuid])
+                    interaction-id (concat ["comment" interaction-id]))
+        base-url (s/join "/" url-parts)
+        final-url (str base-url "?id=" id-token)
         button-cta (if (or (not mention?) interaction-id)
                     "view_comment"
                     "view_post")

        notification-author (:author notification)
        is-default-avatar? (s/starts-with? (:avatar-url notification-author) "/img")
        notification-author-url (user-lib/fix-avatar-url config/filestack-api-key (:avatar-url notification-author) 128)
        uuid (:entry-id notification)
        secure-uuid (:secure-uuid notification)
        origin-url config/web-url
        token-claims {:org-uuid (:org-id notification)
                      :secure-uuid secure-uuid

  (let [notification (:notification msg)
        content (:content notification)
        org (:org msg)
        board (:board msg)
        entry-data (:entry-data notification)
        org-slug (:slug org)
        org-uuid (or (:uuid org) (:org-uuid entry-data) (:org-id notification))
        org-url-part (or org-slug org-uuid)
        board-slug (or (:board-slug entry-data) (:slug board))
        board-uuid (or (:board-uuid entry-data) (:uuid board) (:board-id notification))
        board-url-part (or board-slug board-uuid)
        mention? (:mention notification)
        interaction-id (:interaction-id notification)
        first-name (:first-name msg)
