diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/index.js b/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
index 6910bfcd8..831d293c3 100644
--- a/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
@@ -380,7 +380,7 @@ registerBlockType('tainacan/facets-list', {
                             <div>
                                 <RangeControl
                                     label={__('Maximum number of facets', 'tainacan')}
-                                    value={ maxFacetsNumber }
+                                    value={ maxFacetsNumber ? maxFacetsNumber : 12}
                                     onChange={ ( aMaxFacetsNumber ) => {
                                         maxFacetsNumber = aMaxFacetsNumber;
                                         setAttributes( { maxFacetsNumber: aMaxFacetsNumber } ) 
diff --git a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
index 6168733cb..02e7f9b60 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
@@ -428,7 +428,7 @@ registerBlockType('tainacan/dynamic-items-list', {
                             <div>
                                 <RangeControl
                                     label={__('Maximum number of items', 'tainacan')}
-                                    value={ maxItemsNumber }
+                                    value={ maxItemsNumber ? maxItemsNumber : 12 }
                                     onChange={ ( aMaxItemsNumber ) => {
                                         maxItemsNumber = aMaxItemsNumber;
                                         setAttributes( { maxItemsNumber: aMaxItemsNumber } )