diff --git a/packages/block-library/src/post-template/block.json b/packages/block-library/src/post-template/block.json
index 6a575855583527..da576a83312a45 100644
--- a/packages/block-library/src/post-template/block.json
+++ b/packages/block-library/src/post-template/block.json
@@ -13,7 +13,8 @@
 		"displayLayout",
 		"templateSlug",
 		"previewPostType",
-		"enhancedPagination"
+		"enhancedPagination",
+		"postType"
 	],
 	"supports": {
 		"reusable": false,
diff --git a/packages/block-library/src/post-template/edit.js b/packages/block-library/src/post-template/edit.js
index a9e279ee2c3052..4e7e514ed82b12 100644
--- a/packages/block-library/src/post-template/edit.js
+++ b/packages/block-library/src/post-template/edit.js
@@ -100,6 +100,7 @@ export default function PostTemplateEdit( {
 		} = {},
 		templateSlug,
 		previewPostType,
+		postType: postTypeFromContext,
 	},
 	attributes: { layout },
 	__unstableLayoutClassNames,
@@ -186,7 +187,10 @@ export default function PostTemplateEdit( {
 			}
 			// When we preview Query Loop blocks we should prefer the current
 			// block's postType, which is passed through block context.
-			const usedPostType = previewPostType || postType;
+			const usedPostType =
+				postTypeFromContext !== 'page'
+					? postTypeFromContext
+					: previewPostType || postType;
 			return {
 				posts: getEntityRecords( 'postType', usedPostType, {
 					...query,
diff --git a/packages/block-library/src/query/edit/inspector-controls/index.js b/packages/block-library/src/query/edit/inspector-controls/index.js
index 7d5745e190c9a7..bc900c073f648d 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -45,9 +45,15 @@ import { useToolsPanelDropdownMenuProps } from '../../../utils/hooks';
 const { BlockInfo } = unlock( blockEditorPrivateApis );
 
 export default function QueryInspectorControls( props ) {
-	const { attributes, setQuery, setDisplayLayout, isSingular } = props;
-	const { query, displayLayout } = attributes;
 	const {
+		attributes,
+		setQuery,
+		setDisplayLayout,
+		postTypeFromContext,
+		isSingular,
+	} = props;
+	const { query, displayLayout } = attributes;
+	let {
 		order,
 		orderBy,
 		author: authorIds,
@@ -61,6 +67,16 @@ export default function QueryInspectorControls( props ) {
 		parents,
 		format,
 	} = query;
+	// If a post type is set in context, update `postType` to match it,
+	// unless the post type is `page`, as it usually doesn't make sense to loop
+	// through pages.
+	if (
+		postTypeFromContext &&
+		postTypeFromContext !== 'page' &&
+		postTypeFromContext !== postType
+	) {
+		postType = postTypeFromContext;
+	}
 	const allowedControls = useAllowedControls( attributes );
 	const showSticky = postType === 'post';
 	const {
diff --git a/packages/block-library/src/query/edit/query-content.js b/packages/block-library/src/query/edit/query-content.js
index 5253044243dcb5..bdfcbe0498ec4a 100644
--- a/packages/block-library/src/query/edit/query-content.js
+++ b/packages/block-library/src/query/edit/query-content.js
@@ -103,12 +103,6 @@ export default function QueryContent( {
 		if ( isSingular && query.inherit ) {
 			newQuery.inherit = false;
 		}
-		// We need to update the query in the Editor if a specific post type is set.
-		// Unless the post type is `page`, as it usually doesn't make sense to loop
-		// through pages.
-		if ( postType && postType !== 'page' && query.postType !== postType ) {
-			newQuery.postType = postType;
-		}
 		if ( !! Object.keys( newQuery ).length ) {
 			__unstableMarkNextChangeAsNotPersistent();
 			updateQuery( newQuery );
@@ -116,11 +110,9 @@ export default function QueryContent( {
 	}, [
 		query.perPage,
 		query.inherit,
-		query.postType,
 		postsPerPage,
 		inherit,
 		isSingular,
-		postType,
 		__unstableMarkNextChangeAsNotPersistent,
 		updateQuery,
 	] );
@@ -167,6 +159,7 @@ export default function QueryContent( {
 					setDisplayLayout={ updateDisplayLayout }
 					setAttributes={ setAttributes }
 					clientId={ clientId }
+					postTypeFromContext={ postType }
 					isSingular={ isSingular }
 				/>
 			</InspectorControls>