diff --git a/packages/volto-heading-block/src/components/View.jsx b/packages/volto-heading-block/src/components/View.jsx
index b760209..8009e13 100644
--- a/packages/volto-heading-block/src/components/View.jsx
+++ b/packages/volto-heading-block/src/components/View.jsx
@@ -2,16 +2,26 @@ import React from 'react';
 import { withBlockExtensions } from '@plone/volto/helpers';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
+import { MaybeWrap } from '@plone/volto/components';
 
 const HeadingView = (props) => {
-  const { className, data } = props;
+  const { className, data, blocksConfig } = props;
   const Element = data.tag || 'h2';
   const show_alignment = config.blocks?.blocksConfig?.heading?.show_alignment;
+  const isBlockModelv3 = blocksConfig?.heading?.blockModel === 3;
+
+  const LegacyWrapper = ({ className, children }) => (
+    <div className={cx('block heading', className)}>{children}</div>
+  );
 
   return (
     <>
       {data && (
-        <div className={cx('block heading', className)}>
+        <MaybeWrap
+          condition={!isBlockModelv3}
+          as={LegacyWrapper}
+          className={className}
+        >
           <div className="heading-wrapper">
             <Element
               style={show_alignment ? { textAlign: data.alignment } : {}}
@@ -20,7 +30,7 @@ const HeadingView = (props) => {
               {data?.heading || ''}
             </Element>
           </div>
-        </div>
+        </MaybeWrap>
       )}
     </>
   );