diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
index 092ecdfafb..ca1bdefaa5 160000
--- a/geonode_mapstore_client/client/MapStore2
+++ b/geonode_mapstore_client/client/MapStore2
@@ -1 +1 @@
-Subproject commit 092ecdfafb2f33d66211756fdd43f301ae026164
+Subproject commit ca1bdefaa53575c48fcebf42b74dd75a66f52d20
diff --git a/geonode_mapstore_client/client/js/plugins/Legend.jsx b/geonode_mapstore_client/client/js/plugins/Legend.jsx
index 37012f34a9..32765c912c 100644
--- a/geonode_mapstore_client/client/js/plugins/Legend.jsx
+++ b/geonode_mapstore_client/client/js/plugins/Legend.jsx
@@ -31,7 +31,10 @@ function Legend({
     currentZoomLvl,
     scales,
     language,
-    currentLocale
+    currentLocale,
+    projection,
+    mapSize,
+    mapBbox
 }) {
 
     const [expandLegend, setExpandLegend] = useState(false);
@@ -54,7 +57,10 @@ function Legend({
                 <TOC
                     map={{
                         layers: layers.map(applyVersionParamToLegend),
-                        groups: []
+                        groups: [],
+                        bbox: mapBbox,
+                        size: mapSize,
+                        projection
                     }}
                     theme="legend"
                     config={{
@@ -97,7 +103,10 @@ const ConnectedLegend = connect(
             map && map.mapOptions && map.mapOptions.view && map.mapOptions.view.DPI || null
         ),
         language: isLocalizedLayerStylesEnabled ? currentLocaleLanguage : null,
-        currentLocale
+        currentLocale,
+        projection: map?.projection || 'EPSG:3857',
+        mapSize: map?.size,
+        mapBbox: map?.bbox
     })),
     {
         onUpdateNode: updateNode
diff --git a/geonode_mapstore_client/client/js/utils/ResourceUtils.js b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
index 8461adf8eb..81fda9328e 100644
--- a/geonode_mapstore_client/client/js/utils/ResourceUtils.js
+++ b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
@@ -14,7 +14,7 @@ import { getConfigProp, convertFromLegacy, normalizeConfig } from '@mapstore/fra
 import { getGeoNodeLocalConfig, parseDevHostname } from '@js/utils/APIUtils';
 import { ProcessTypes, ProcessStatus } from '@js/utils/ResourceServiceUtils';
 import { uniqBy, orderBy, isString, isObject, pick, difference } from 'lodash';
-import { excludeGoogleBackground, extractTileMatrixFromSources } from '@mapstore/framework/utils/LayersUtils';
+import { excludeGoogleBackground, extractTileMatrixFromSources, ServerTypes } from '@mapstore/framework/utils/LayersUtils';
 import { determineResourceType } from '@js/utils/FileUtils';
 import { isImageServerUrl } from '@mapstore/framework/utils/ArcGISUtils';
 
@@ -89,7 +89,8 @@ export const resourceToLayerConfig = (resource) => {
         has_time: hasTime,
         default_style: defaultStyle,
         ptype,
-        subtype
+        subtype,
+        sourcetype
     } = resource;
 
     const bbox = getExtentFromResource(resource);
@@ -191,7 +192,10 @@ export const resourceToLayerConfig = (resource) => {
             ...(params && { params }),
             ...(dimensions.length > 0 && ({ dimensions })),
             extendedParams,
-            ...(fields && { fields })
+            ...(fields && { fields }),
+            ...(sourcetype === 'REMOTE' && !wmsUrl.includes('/geoserver/') && {
+                serverType: ServerTypes.NO_VENDOR
+            })
         };
     }
 };