diff --git a/packages/editor/src/components/collab-sidebar/comments.js b/packages/editor/src/components/collab-sidebar/comments.js
index 6b781cc1c7937..b00c8494da031 100644
--- a/packages/editor/src/components/collab-sidebar/comments.js
+++ b/packages/editor/src/components/collab-sidebar/comments.js
@@ -17,14 +17,16 @@ import {
 } from '@wordpress/components';
 import { Icon, check, published, moreVertical } from '@wordpress/icons';
 import { __, _x } from '@wordpress/i18n';
-import { useSelect, useDispatch, select } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
+import { useEntityBlockEditor } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import CommentAuthorInfo from './comment-author-info';
 import CommentForm from './comment-form';
+import { getBlockByCommentId } from './utils';
 
 /**
  * Renders the Comments component.
@@ -35,6 +37,8 @@ import CommentForm from './comment-form';
  * @param {Function} props.onAddReply       - The function to add a reply to a comment.
  * @param {Function} props.onCommentDelete  - The function to delete a comment.
  * @param {Function} props.onCommentResolve - The function to mark a comment as resolved.
+ * @param {string}   props.postType         - The post type.
+ * @param {number}   props.postId           - The post ID.
  * @return {React.ReactNode} The rendered Comments component.
  */
 export function Comments( {
@@ -43,6 +47,8 @@ export function Comments( {
 	onAddReply,
 	onCommentDelete,
 	onCommentResolve,
+	postType, // Ensure postType is passed as a prop
+	postId, // Ensure postId is passed as a prop
 } ) {
 	const [ actionState, setActionState ] = useState( false );
 	const [ isConfirmDialogOpen, setIsConfirmDialogOpen ] = useState( false );
@@ -64,7 +70,7 @@ export function Comments( {
 		setIsConfirmDialogOpen( false );
 	};
 
-	const blockCommentId = useSelect( () => {
+	const blockCommentId = useSelect( ( select ) => {
 		const clientID = select( blockEditorStore ).getSelectedBlockClientId();
 		return (
 			select( blockEditorStore ).getBlock( clientID )?.attributes
@@ -72,29 +78,13 @@ export function Comments( {
 		);
 	}, [] );
 
-	const findBlockByCommentId = ( blocks, commentId ) => {
-		for ( const block of blocks ) {
-			if ( block.attributes.blockCommentId === commentId ) {
-				return block;
-			}
-			if ( block.innerBlocks && block.innerBlocks.length > 0 ) {
-				const foundBlock = findBlockByCommentId(
-					block.innerBlocks,
-					commentId
-				);
-				if ( foundBlock ) {
-					return foundBlock;
-				}
-			}
-		}
-		return null;
-	};
+	const [ blocks ] = useEntityBlockEditor( 'postType', postType, {
+		id: postId,
+	} );
 
-	const { getBlocks } = useSelect( blockEditorStore );
 	const { selectBlock } = useDispatch( blockEditorStore );
 	const handleThreadClick = ( thread ) => {
-		const selClientBlocks = getBlocks();
-		const block = findBlockByCommentId( selClientBlocks, thread.id );
+		const block = getBlockByCommentId( blocks, thread.id );
 		if ( block ) {
 			selectBlock( block.clientId ); // Use the action to select the block
 		}
diff --git a/packages/editor/src/components/collab-sidebar/index.js b/packages/editor/src/components/collab-sidebar/index.js
index 17a23a227424a..047318538e4af 100644
--- a/packages/editor/src/components/collab-sidebar/index.js
+++ b/packages/editor/src/components/collab-sidebar/index.js
@@ -221,6 +221,11 @@ function CollabSidebarContent( { showCommentBoard, setShowCommentBoard } ) {
 		);
 	};
 
+	const postType = useSelect(
+		( select ) => select( editorStore ).getCurrentPostType(),
+		[]
+	);
+
 	return (
 		<div className="editor-collab-sidebar-panel">
 			<AddComment
@@ -234,6 +239,8 @@ function CollabSidebarContent( { showCommentBoard, setShowCommentBoard } ) {
 				onAddReply={ addNewComment }
 				onCommentDelete={ onCommentDelete }
 				onCommentResolve={ onCommentResolve }
+				postId={ postId }
+				postType={ postType }
 			/>
 		</div>
 	);
diff --git a/packages/editor/src/components/collab-sidebar/utils.js b/packages/editor/src/components/collab-sidebar/utils.js
index 7e73344c5dc0e..b6d8e548750ac 100644
--- a/packages/editor/src/components/collab-sidebar/utils.js
+++ b/packages/editor/src/components/collab-sidebar/utils.js
@@ -7,3 +7,21 @@
 export function sanitizeCommentString( str ) {
 	return str.trim();
 }
+
+export const getBlockByCommentId = ( blocks, commentId ) => {
+	for ( const block of blocks ) {
+		if ( block.attributes.blockCommentId === commentId ) {
+			return block;
+		}
+		if ( block.innerBlocks && block.innerBlocks.length > 0 ) {
+			const foundBlock = getBlockByCommentId(
+				block.innerBlocks,
+				commentId
+			);
+			if ( foundBlock ) {
+				return foundBlock;
+			}
+		}
+	}
+	return blocks ? getBlockByCommentId( blocks, commentId ) : null;
+};