diff --git a/packages/editor/src/components/post-format/index.js b/packages/editor/src/components/post-format/index.js
index 83c6fa6ca5ce1f..bd66e74cab41ec 100644
--- a/packages/editor/src/components/post-format/index.js
+++ b/packages/editor/src/components/post-format/index.js
@@ -33,19 +33,20 @@ export default function PostFormat() {
 	const instanceId = useInstanceId( PostFormat );
 	const postFormatSelectorId = `post-format-selector-${ instanceId }`;
 
-	const { postFormat, suggestedFormat, supportedFormats } = useSelect(
+	const { currentFormat, suggestedFormat, supportedFormats } = useSelect(
 		( select ) => {
 			const themeSupportedFormats =
 				select( 'core' ).getThemeSupports().formats ?? [];
 			const { getEditedPostAttribute, getSuggestedPostFormat } = select(
 				'core/editor'
 			);
-			const _postFormat = getEditedPostAttribute( 'format' );
+			const _currentFormat =
+				getEditedPostAttribute( 'format' ) ?? 'standard';
 
 			// Ensure current format is always in the set.
 			// The current format may not be a format supported by the theme.
 			const _supportedFormats = union(
-				[ _postFormat ],
+				[ _currentFormat ],
 				themeSupportedFormats
 			);
 
@@ -53,17 +54,20 @@ export default function PostFormat() {
 			// to check to make sure.
 			const potentialSuggestedFormat = getSuggestedPostFormat();
 
+			// If the suggested format isn't null, isn't already applied, and is
+			// supported by the theme, return it. Otherwise, return null.
 			let supportedSuggestedFormat = null;
 
 			if (
 				potentialSuggestedFormat &&
+				potentialSuggestedFormat !== _currentFormat &&
 				_supportedFormats.includes( potentialSuggestedFormat )
 			) {
 				supportedSuggestedFormat = potentialSuggestedFormat;
 			}
 
 			return {
-				postFormat: _postFormat ?? 'standard',
+				currentFormat: _currentFormat,
 				supportedFormats: _supportedFormats,
 				suggestedFormat: supportedSuggestedFormat,
 			};
@@ -83,7 +87,7 @@ export default function PostFormat() {
 						{ __( 'Post Format' ) }
 					</label>
 					<SelectControl
-						value={ postFormat }
+						value={ currentFormat }
 						onChange={ updatePostFormat }
 						id={ postFormatSelectorId }
 						options={ supportedFormats.map( ( format ) => ( {
@@ -93,7 +97,7 @@ export default function PostFormat() {
 					/>
 				</div>
 
-				{ suggestedFormat && suggestedFormat !== postFormat && (
+				{ suggestedFormat && (
 					<div className="editor-post-format__suggestion">
 						{ __( 'Suggestion:' ) }{ ' ' }
 						<Button
diff --git a/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js b/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
index 50e6a40c617d78..aee11fdb3985c0 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
@@ -29,7 +29,7 @@ export default function PostFormatPanel() {
 		const potentialSuggestedFormat = getSuggestedPostFormat();
 
 		// If the suggested format isn't null, isn't already applied, and is
-		// supported by the theme, return it.
+		// supported by the theme, return it. Otherwise, return null.
 		if (
 			potentialSuggestedFormat &&
 			potentialSuggestedFormat !== currentFormat &&