diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
index d2626a2dc3..705dc9f47b 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
@@ -33,13 +33,12 @@ export type Props = {
 
 const useStyles = makeStyles<Theme>(theme => ({
   quadrantLegend: {
-    overflowY: 'scroll',
+    overflowY: 'auto',
     scrollbarWidth: 'thin',
   },
   quadrant: {
     height: '100%',
     width: '100%',
-    overflow: 'scroll',
     scrollbarWidth: 'thin',
     pointerEvents: 'none',
   },
@@ -188,8 +187,12 @@ const RadarLegend = (props: Props): JSX.Element => {
               <li
                 key={entry.id}
                 value={(entry.index || 0) + 1}
-                onMouseEnter={() => onEntryMouseEnter?.(entry)}
-                onMouseLeave={() => onEntryMouseLeave?.(entry)}
+                onMouseEnter={
+                  onEntryMouseEnter && (() => onEntryMouseEnter(entry))
+                }
+                onMouseLeave={
+                  onEntryMouseLeave && (() => onEntryMouseLeave(entry))
+                }
               >
                 <RadarLegendLink
                   url={entry.url}
diff --git a/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx b/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx
index a5d7e0442c..d9788be887 100644
--- a/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx
+++ b/plugins/tech-radar/src/components/RadarPlot/RadarPlot.tsx
@@ -55,8 +55,12 @@ const RadarPlot = (props: Props): JSX.Element => {
         quadrants={quadrants}
         rings={rings}
         entries={entries}
-        onEntryMouseEnter={entry => onEntryMouseEnter?.(entry)}
-        onEntryMouseLeave={entry => onEntryMouseLeave?.(entry)}
+        onEntryMouseEnter={
+          onEntryMouseEnter && (entry => onEntryMouseEnter(entry))
+        }
+        onEntryMouseLeave={
+          onEntryMouseLeave && (entry => onEntryMouseLeave(entry))
+        }
       />
       <g transform={`translate(${width / 2}, ${height / 2})`}>
         <RadarGrid radius={radius} rings={rings} />
@@ -72,8 +76,8 @@ const RadarPlot = (props: Props): JSX.Element => {
             description={entry.description}
             moved={entry.moved}
             title={entry.title}
-            onMouseEnter={() => onEntryMouseEnter?.(entry)}
-            onMouseLeave={() => onEntryMouseLeave?.(entry)}
+            onMouseEnter={onEntryMouseEnter && (() => onEntryMouseEnter(entry))}
+            onMouseLeave={onEntryMouseLeave && (() => onEntryMouseLeave(entry))}
           />
         ))}
         <RadarBubble