diff --git a/geonode/thumbs/tests/test_unit.py b/geonode/thumbs/tests/test_unit.py
index 49c8168d604..a00936b4ada 100644
--- a/geonode/thumbs/tests/test_unit.py
+++ b/geonode/thumbs/tests/test_unit.py
@@ -230,8 +230,8 @@ def test_datasets_locations_simple_map(self):
             [
                 [
                     settings.OGC_SERVER["default"]["LOCATION"],
-                    ["geonode:Meteorite_Landings_from_NASA_Open_Data_Portal1", dataset.alternate],
-                    ["test_style", "theaters_nyc"],
+                    [dataset.alternate, "geonode:Meteorite_Landings_from_NASA_Open_Data_Portal1"],
+                    ["theaters_nyc", "test_style"],
                 ]
             ],
         )
@@ -255,9 +255,9 @@ def test_datasets_locations_composition_map_default_bbox(self):
             [
                 settings.GEOSERVER_LOCATION,
                 [
-                    "rt_geologia.dbg_risorse_minerarie",
-                    "geonode:Meteorite_Landings_from_NASA_Open_Data_Portal1",
                     "geonode:theaters_nyc",
+                    "geonode:Meteorite_Landings_from_NASA_Open_Data_Portal1",
+                    "rt_geologia.dbg_risorse_minerarie",
                 ],
                 [],
             ]
diff --git a/geonode/thumbs/thumbnails.py b/geonode/thumbs/thumbnails.py
index a7c8e28a255..3006a5bf58f 100644
--- a/geonode/thumbs/thumbnails.py
+++ b/geonode/thumbs/thumbnails.py
@@ -271,7 +271,7 @@ def _datasets_locations(
             else:
                 bbox = utils.transform_bbox(instance.bbox, target_crs)
     elif isinstance(instance, Map):
-        for map_dataset in instance.maplayers.iterator():
+        for map_dataset in instance.maplayers.filter(visibility=True).order_by("order").iterator():
             if not map_dataset.local and not map_dataset.ows_url:
                 logger.warning(
                     "Incorrectly defined remote dataset encountered (no OWS URL defined)."