diff --git a/client/src/containers/analysis-eudr/map/basemap/component.tsx b/client/src/containers/analysis-eudr/map/basemap/component.tsx
index 9dded8d8d..11d3a215d 100644
--- a/client/src/containers/analysis-eudr/map/basemap/component.tsx
+++ b/client/src/containers/analysis-eudr/map/basemap/component.tsx
@@ -46,7 +46,10 @@ const EUDRBasemapControl = () => {
     (checked: boolean) => {
       dispatch(setBasemap('planet'));
       dispatch(setPlanetLayer({ active: checked }));
-      if (!checked) dispatch(setPlanetCompareLayer({ active: false }));
+      if (!checked) {
+        dispatch(setBasemap('light'));
+        dispatch(setPlanetCompareLayer({ active: false }));
+      }
     },
     [dispatch],
   );
diff --git a/client/src/containers/analysis-eudr/map/compare.tsx b/client/src/containers/analysis-eudr/map/compare.tsx
index d3ff59eef..1c6ebe1c0 100644
--- a/client/src/containers/analysis-eudr/map/compare.tsx
+++ b/client/src/containers/analysis-eudr/map/compare.tsx
@@ -53,7 +53,7 @@ setDefaultCredentials({
     'eyJhbGciOiJIUzI1NiJ9.eyJhIjoiYWNfemsydWhpaDYiLCJqdGkiOiJjZDk0ZWIyZSJ9.oqLagnOEc-j7Z4hY-MTP1yoZA_vJ7WYYAkOz_NUmCJo',
 });
 
-const EUDRCompareMap: React.FC<{ supplierId?: string }> = ({ supplierId }) => {
+const EUDRCompareMap = () => {
   const maps = useMap();
 
   const {
diff --git a/client/src/pages/eudr/suppliers/[supplierId].tsx b/client/src/pages/eudr/suppliers/[supplierId].tsx
index 01783aac6..a74697c72 100644
--- a/client/src/pages/eudr/suppliers/[supplierId].tsx
+++ b/client/src/pages/eudr/suppliers/[supplierId].tsx
@@ -97,7 +97,7 @@ const MapPage: NextPageWithLayout = () => {
 
         <section className="relative flex h-screen flex-1 flex-col">
           {!planetCompareLayer.active && <DynamicMap supplierId={supplierId} />}
-          {planetCompareLayer.active && <DynamicCompareMap supplierId={supplierId} />}
+          {planetCompareLayer.active && <DynamicCompareMap />}
         </section>
       </div>
     </MapProvider>