diff --git a/packages/editor/src/hooks/custom-class-name.js b/packages/editor/src/hooks/custom-class-name.js
index 9779dfd1a2bb5a..3d4af472276701 100644
--- a/packages/editor/src/hooks/custom-class-name.js
+++ b/packages/editor/src/hooks/custom-class-name.js
@@ -65,7 +65,7 @@ export const withInspectorControl = createHigherOrderComponent( ( BlockEdit ) =>
 							value={ props.attributes.className || '' }
 							onChange={ ( nextValue ) => {
 								props.setAttributes( {
-									className: nextValue,
+									className: nextValue !== '' ? nextValue : undefined,
 								} );
 							} }
 						/>