diff --git a/lisp/forge-topic.el b/lisp/forge-topic.el
index dd66c0c7..8acfc8bc 100644
--- a/lisp/forge-topic.el
+++ b/lisp/forge-topic.el
@@ -715,14 +715,14 @@ can be selected from the start."
      "Labels: "
      (forge--format-labels (and obj (forge-get-repository obj)))
      nil t
-     (and (forge-topic-p obj)
+     (and (cl-typep obj 'forge-topic)
           (forge--format-labels obj crm-separator)))))
 
 (defun forge-read-topic-marks (&optional obj)
   (let ((crm-separator ","))
     (magit-completing-read-multiple
      "Marks: " (forge--format-marks) nil t
-     (and (forge-topic-p obj)
+     (and (cl-typep obj 'forge-topic)
           (forge--format-marks obj crm-separator)))))
 
 (defun forge-read-topic-assignees (&optional topic)