diff --git a/src/main/resources/site/parts/highchart/highchart.ts b/src/main/resources/site/parts/highchart/highchart.ts
index c9d19dfad..d7ae0bec9 100644
--- a/src/main/resources/site/parts/highchart/highchart.ts
+++ b/src/main/resources/site/parts/highchart/highchart.ts
@@ -103,6 +103,7 @@ function renderPart(req: XP.Request, highchartIds: Array<string>): XP.Response {
   if (isEnabled('highchart-react', true, 'ssb')) {
     // R4xp disables hydration in edit mode, but highcharts need hydration to show
     // we sneaky swap mode since we want a render of higchart in edit mode
+    // Works good for highchart macro, not so much when part
     const _req = req
     if (req.mode === 'edit') _req.mode = 'preview'
 
diff --git a/src/main/resources/site/parts/highmap/highmap.ts b/src/main/resources/site/parts/highmap/highmap.ts
index 26f29ddcf..b55860c36 100644
--- a/src/main/resources/site/parts/highmap/highmap.ts
+++ b/src/main/resources/site/parts/highmap/highmap.ts
@@ -174,6 +174,11 @@ function renderPart(req: XP.Request, highmapId: string | undefined): XP.Response
       language: page.language,
     }
 
+
+    // R4xp disables hydration in edit mode, but highmap need hydration to show
+    // we sneaky swap mode since we want a render of highmap in edit mode
+    // Works good for highmap macro, not so much when part
+    if (req.mode === 'edit') req.mode = 'preview'
     return render('site/parts/highmap/Highmap', props, req)
   }
   return {