diff --git a/lib/block-supports/dimensions.php b/lib/block-supports/dimensions.php
index f3ddbaff2b99bd..a93457347274b2 100644
--- a/lib/block-supports/dimensions.php
+++ b/lib/block-supports/dimensions.php
@@ -43,7 +43,7 @@ function gutenberg_register_dimensions_support( $block_type ) {
  *
  * @return array Block dimensions CSS classes and inline styles.
  */
-function gutenberg_apply_dimensions_support( $block_type, $block_attributes ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+function gutenberg_apply_dimensions_support( $block_type, $block_attributes ) {
 	if ( gutenberg_skip_dimensions_serialization( $block_type ) ) {
 		return array();
 	}
@@ -61,7 +61,7 @@ function gutenberg_apply_dimensions_support( $block_type, $block_attributes ) {
 		}
 	}
 
-	// Minimum height support.
+	// Minimum height.
 	$has_min_height_support = gutenberg_block_has_support( $block_type, array( '__experimentalDimensions', 'minHeight' ), false );
 
 	if ( $has_min_height_support ) {
diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index 7b6b470fabe53a..2cc9522f9543b6 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -61,7 +61,7 @@ class WP_Theme_JSON_Gutenberg {
 			'text'       => null,
 		),
 		'dimensions' => array(
-			'height' => null,
+			'height'    => null,
 			'minHeight' => null,
 		),
 		'spacing'    => array(
@@ -99,7 +99,7 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		'custom'     => null,
 		'dimensions' => array(
-			'customHeight' => null,
+			'customHeight'    => null,
 			'customMinHeight' => null,
 		),
 		'layout'     => array(
diff --git a/lib/theme.json b/lib/theme.json
index 3a0689f0c8693c..fc8db97c44fc07 100644
--- a/lib/theme.json
+++ b/lib/theme.json
@@ -211,7 +211,8 @@
 			]
 		},
 		"dimensions": {
-			"customHeight": false
+			"customHeight": false,
+			"customMinHeight": false
 		},
 		"spacing": {
 			"customMargin": false,