         comment-list (if (= access-level :public)
                         []
                         (take config/inline-comment-count (reverse (sort-by :created-at comments))))
+        follow-ups-list (if (= access-level :public)
+                          []
+                          (map #(if (= (-> % :assignee :user-id) user-id)
+                                  (assoc % :links [(complete-follow-up-link org-uuid board-uuid entry-uuid (:uuid %))])
+                                  %)
+                           (:follow-ups entry)))
         links (if secure-access?
                 ;; secure UUID access
                 [(secure-self-link org-slug secure-uuid)]

  ([org-slug board-slug entry :guard map?] (url org-slug board-slug (:uuid entry)))

  ([org-slug board-slug entry-uuid]
  (str (url org-slug board-slug) "/" entry-uuid)))

(defn- self-link [org-slug board-slug entry-uuid]
  (hateoas/self-link (url org-slug board-slug entry-uuid) {:accept mt/entry-media-type}))

      (include-secure-uuid secure-uuid access-level)
      (include-interactions reaction-list :reactions)
      (include-interactions comment-list :comments)
      (assoc :follow-ups follow-ups-list)
      (assoc :links full-links))))

(defn render-entry-for-collection
