diff --git a/packages/editor/src/components/document-bar/index.js b/packages/editor/src/components/document-bar/index.js
index 7b94a6fbeb3be..f5ca65dfe18ed 100644
--- a/packages/editor/src/components/document-bar/index.js
+++ b/packages/editor/src/components/document-bar/index.js
@@ -54,6 +54,7 @@ const MotionButton = motion( Button );
  */
 export default function DocumentBar( props ) {
 	const {
+		postId,
 		postType,
 		postTypeLabel,
 		documentTitle,
@@ -93,6 +94,7 @@ export default function DocumentBar( props ) {
 		const _postTypeLabel = getPostType( _postType )?.labels?.singular_name;
 
 		return {
+			postId: _postId,
 			postType: _postType,
 			postTypeLabel: _postTypeLabel,
 			documentTitle: _document.title,
@@ -120,7 +122,7 @@ export default function DocumentBar( props ) {
 	const title = props.title || entityTitle;
 	const icon = props.icon;
 
-	const pageTypeBadge = usePageTypeBadge();
+	const pageTypeBadge = usePageTypeBadge( postId );
 
 	const mountedRef = useRef( false );
 	useEffect( () => {
diff --git a/packages/editor/src/components/post-card-panel/index.js b/packages/editor/src/components/post-card-panel/index.js
index c8264a30d9723..f6f5c3deca9f5 100644
--- a/packages/editor/src/components/post-card-panel/index.js
+++ b/packages/editor/src/components/post-card-panel/index.js
@@ -64,7 +64,7 @@ export default function PostCardPanel( {
 		[ postId, postType ]
 	);
 
-	const pageTypeBadge = usePageTypeBadge();
+	const pageTypeBadge = usePageTypeBadge( parseInt( postId, 10 ) );
 
 	return (
 		<div className="editor-post-card-panel">
diff --git a/packages/editor/src/utils/pageTypeBadge.js b/packages/editor/src/utils/pageTypeBadge.js
index 321b9caa17769..bc787b1228422 100644
--- a/packages/editor/src/utils/pageTypeBadge.js
+++ b/packages/editor/src/utils/pageTypeBadge.js
@@ -5,19 +5,14 @@ import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 
-/**
- * Internal dependencies
- */
-import { store as editorStore } from '../store';
-
 /**
  * Custom hook to get the page type badge for the current post on edit site view.
+ *
+ * @param {number} postId postId of the current post being edited.
  */
-export default function usePageTypeBadge() {
+export default function usePageTypeBadge( postId ) {
 	const { isFrontPage, isPostsPage } = useSelect( ( select ) => {
-		const { getCurrentPostId } = select( editorStore );
 		const { canUser, getEditedEntityRecord } = select( coreStore );
-		const postId = getCurrentPostId();
 		const siteSettings = canUser( 'read', {
 			kind: 'root',
 			name: 'site',