diff --git a/app/actions/definitions/documents.tsx b/app/actions/definitions/documents.tsx
index 7c2f4fee7..8632f1ad1 100644
--- a/app/actions/definitions/documents.tsx
+++ b/app/actions/definitions/documents.tsx
@@ -781,8 +781,7 @@ export const openDocumentComments = createAction({
     const can = stores.policies.abilities(activeDocumentId ?? "");
     return (
       !!activeDocumentId &&
-      can.read &&
-      !can.restore &&
+      can.comment &&
       !!stores.auth.team?.getPreference(TeamPreference.Commenting)
     );
   },
diff --git a/app/scenes/Document/components/DocumentMeta.tsx b/app/scenes/Document/components/DocumentMeta.tsx
index d87ea0a60..bda1965d2 100644
--- a/app/scenes/Document/components/DocumentMeta.tsx
+++ b/app/scenes/Document/components/DocumentMeta.tsx
@@ -11,6 +11,7 @@ import Revision from "~/models/Revision";
 import DocumentMeta from "~/components/DocumentMeta";
 import Fade from "~/components/Fade";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
+import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import { documentPath, documentInsightsPath } from "~/utils/routeHelpers";
 
@@ -18,18 +19,11 @@ type Props = {
   /* The document to display meta data for */
   document: Document;
   revision?: Revision;
-  isDraft: boolean;
   to?: LocationDescriptor;
   rtl?: boolean;
 };
 
-function TitleDocumentMeta({
-  to,
-  isDraft,
-  document,
-  revision,
-  ...rest
-}: Props) {
+function TitleDocumentMeta({ to, document, revision, ...rest }: Props) {
   const { views, comments, ui } = useStores();
   const { t } = useTranslation();
   const match = useRouteMatch();
@@ -38,6 +32,7 @@ function TitleDocumentMeta({
   const totalViewers = documentViews.length;
   const onlyYou = totalViewers === 1 && documentViews[0].userId;
   const viewsLoadedOnMount = React.useRef(totalViewers > 0);
+  const can = usePolicy(document.id);
 
   const Wrapper = viewsLoadedOnMount.current ? React.Fragment : Fade;
 
@@ -46,7 +41,7 @@ function TitleDocumentMeta({
 
   return (
     <Meta document={document} revision={revision} to={to} replace {...rest}>
-      {team.getPreference(TeamPreference.Commenting) && (
+      {team.getPreference(TeamPreference.Commenting) && can.comment && (
         <>
           &nbsp;•&nbsp;
           <CommentLink
@@ -60,7 +55,7 @@ function TitleDocumentMeta({
           </CommentLink>
         </>
       )}
-      {totalViewers && !isDraft ? (
+      {totalViewers && !document.isDraft && !document.isTemplate ? (
         <Wrapper>
           &nbsp;•&nbsp;
           <Link
diff --git a/app/scenes/Document/components/Editor.tsx b/app/scenes/Document/components/Editor.tsx
index 5bf069d59..1c638ac74 100644
--- a/app/scenes/Document/components/Editor.tsx
+++ b/app/scenes/Document/components/Editor.tsx
@@ -173,7 +173,6 @@ function DocumentEditor(props: Props, ref: React.RefObject<any>) {
       />
       {!shareId && (
         <DocumentMeta
-          isDraft={isDraft}
           document={document}
           to={
             match.path === matchDocumentHistory