diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Comment.js b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
index 4e91ce9d2..e5d42a86e 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
@@ -97,16 +97,11 @@ const singleCommentFragment = gql`
       edited
       editableUntil
     }
-    ${getSlotFragmentSpreads(slots, 'root')}
     ${getSlotFragmentSpreads(slots, 'comment')}
-    ...${getDefinitionName(CommentBox.fragments.root)}
     ...${getDefinitionName(CommentBox.fragments.comment)}
-    ...${getDefinitionName(ReplyBox.fragments.root)}
     ...${getDefinitionName(ReplyBox.fragments.comment)}
   }
-  ${CommentBox.fragments.root}
   ${CommentBox.fragments.comment}
-  ${ReplyBox.fragments.root}
   ${ReplyBox.fragments.comment}
 `;
 
@@ -119,7 +114,11 @@ const withCommentFragments = withFragments({
         }
       }
       ${getSlotFragmentSpreads(slots, 'root')}
+      ...${getDefinitionName(CommentBox.fragments.root)}
+      ...${getDefinitionName(ReplyBox.fragments.root)}
     }
+    ${CommentBox.fragments.root}
+    ${ReplyBox.fragments.root}
     `,
   asset: gql`
     fragment CoralEmbedStream_Comment_asset on Asset {