diff --git a/blocks/block-controls/index.js b/blocks/block-controls/index.js
index b3c93c7e840d5..d95c6c7cb422f 100644
--- a/blocks/block-controls/index.js
+++ b/blocks/block-controls/index.js
@@ -9,11 +9,6 @@ import { Fill } from 'react-slot-fill';
 import Toolbar from 'components/toolbar';
 
 export default function BlockControls( { controls } ) {
-	controls = controls.map( ( control ) => ( {
-		...control,
-		isActive: !! control.isActive && control.isActive(),
-	} ) );
-
 	return (
 		<Fill name="Formatting.Toolbar">
 			<Toolbar controls={ controls } />
diff --git a/blocks/library/heading/index.js b/blocks/library/heading/index.js
index 72f9896120023..fa6a0cca13655 100644
--- a/blocks/library/heading/index.js
+++ b/blocks/library/heading/index.js
@@ -79,7 +79,7 @@ registerBlock( 'core/heading', {
 						'123456'.split( '' ).map( ( level ) => ( {
 							icon: 'heading',
 							title: wp.i18n.sprintf( wp.i18n.__( 'Heading %s' ), level ),
-							isActive: () => 'H' + level === nodeName,
+							isActive: 'H' + level === nodeName,
 							onClick: () => setAttributes( { nodeName: 'H' + level } ),
 							subscript: level,
 						} ) )