diff --git a/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.html b/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.html
index 93d4623dbde..82d9cf18bfc 100644
--- a/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.html
+++ b/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.html
@@ -36,6 +36,10 @@ <h3><wicket:message key="mapmlSectionHeading">MapML Settings</wicket:message></h
                                 <input id="multiextent" wicket:id="multiextent" type="checkbox"></input>
                                 <label for="multiextent"><wicket:message key="multiextent">Multi-Layer as Multi-Extent</wicket:message></label>
                             </li>
+                            <li>
+                                <input id="useFeatures" wicket:id="useFeatures" type="checkbox"></input>
+                                <label for="useFeatures"><wicket:message key="mapmlUseFeatures">Use Features</wicket:message></label>
+                            </li>
                         </ul>
                     </fieldset>
                 </li>
diff --git a/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.java b/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.java
index 3284c6ffda9..35e0a1aab8f 100644
--- a/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.java
+++ b/src/extension/mapml/src/main/java/org/geoserver/mapml/MapMLLayerGroupConfigurationPanel.java
@@ -6,6 +6,7 @@
 package org.geoserver.mapml;
 
 import static org.geoserver.mapml.MapMLConstants.MAPML_MULTIEXTENT;
+import static org.geoserver.mapml.MapMLConstants.MAPML_USE_FEATURES;
 import static org.geoserver.mapml.MapMLConstants.MAPML_USE_TILES;
 import static org.geoserver.mapml.MapMLLayerConfigurationPanel.getAvailableMimeTypes;
 import static org.geoserver.web.demo.MapMLFormatLink.FORMAT_OPTION_DEFAULT;
@@ -70,6 +71,11 @@ protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) {
         });
         add(useTiles);
 
+        // add the checkbox to select features or not
+        MapModel<Boolean> useFeaturesModel = new MapModel<>(new PropertyModel<>(model, METADATA), MAPML_USE_FEATURES);
+        CheckBox useFeatures = new CheckBox("useFeatures", useFeaturesModel);
+        add(useFeatures);
+
         // add the checkbox to select multiextent or not
         MapModel<Boolean> multiextentModel = new MapModel<>(new PropertyModel<>(model, METADATA), MAPML_MULTIEXTENT);
         // in previous versions, the multiextent option was stored in the WMSInfo