diff --git a/web/src/components/Article/Article.tsx b/web/src/components/Article/Article.tsx
index 6aa0cbf18..48654900c 100644
--- a/web/src/components/Article/Article.tsx
+++ b/web/src/components/Article/Article.tsx
@@ -24,7 +24,7 @@ const Article = ({ article, summary = false }) => {
         <div className="mt-12">
           <CommentForm postId={article.id} />
           <div className="mt-12">
-            <CommentsCell />
+            <CommentsCell postId={article.id} />
           </div>
         </div>
       )}
diff --git a/web/src/components/CommentForm/CommentForm.tsx b/web/src/components/CommentForm/CommentForm.tsx
index cc3010935..659e6db97 100644
--- a/web/src/components/CommentForm/CommentForm.tsx
+++ b/web/src/components/CommentForm/CommentForm.tsx
@@ -40,7 +40,7 @@ const CommentForm = ({ postId }: Props) => {
       setHasPosted(true)
       toast.success('Thank you for your comment!')
     },
-    refetchQueries: [{ query: CommentsQuery }],
+    refetchQueries: [{ query: CommentsQuery, variables: { postId } }],
   })
   const onSubmit: SubmitHandler<FormValues> = (input) => {
     createComment({ variables: { input: { postId, ...input } } })
diff --git a/web/src/components/CommentsCell/CommentsCell.tsx b/web/src/components/CommentsCell/CommentsCell.tsx
index 024e862e5..0d3113604 100644
--- a/web/src/components/CommentsCell/CommentsCell.tsx
+++ b/web/src/components/CommentsCell/CommentsCell.tsx
@@ -5,8 +5,8 @@ import type { CellSuccessProps, CellFailureProps } from '@redwoodjs/web'
 import Comment from 'src/components/Comment'
 
 export const QUERY = gql`
-  query CommentsQuery {
-    comments {
+  query CommentsQuery($postId: Int!) {
+    comments(postId: $postId) {
       id
       name
       body