diff --git a/frontend/src/component/executiveDashboard/ExecutiveDashboard.tsx b/frontend/src/component/executiveDashboard/ExecutiveDashboard.tsx
index 89c0664bd51..b8f0c9e30c3 100644
--- a/frontend/src/component/executiveDashboard/ExecutiveDashboard.tsx
+++ b/frontend/src/component/executiveDashboard/ExecutiveDashboard.tsx
@@ -49,16 +49,16 @@ const ChartWidget = styled(Widget)(({ theme }) => ({
     },
 }));
 
-const StickyWrapper = styled(Box)<{ scrolled?: boolean }>(
-    ({ theme, scrolled }) => ({
-        position: 'sticky',
-        top: 0,
-        zIndex: 1000,
-        padding: scrolled ? theme.spacing(2, 0) : theme.spacing(0, 0, 2),
-        background: theme.palette.background.application,
-        transition: 'padding 0.3s ease',
-    }),
-);
+const StickyWrapper = styled(Box, {
+    shouldForwardProp: (prop) => prop !== 'scrolled',
+})<{ scrolled?: boolean }>(({ theme, scrolled }) => ({
+    position: 'sticky',
+    top: 0,
+    zIndex: 1000,
+    padding: scrolled ? theme.spacing(2, 0) : theme.spacing(0, 0, 2),
+    background: theme.palette.background.application,
+    transition: 'padding 0.3s ease',
+}));
 
 export const ExecutiveDashboard: VFC = () => {
     const [scrolled, setScrolled] = useState(false);
diff --git a/frontend/src/component/executiveDashboard/componentsChart/MetricsSummaryChart/MetricsChartTooltip/MetricsChartTooltip.tsx b/frontend/src/component/executiveDashboard/componentsChart/MetricsSummaryChart/MetricsChartTooltip/MetricsChartTooltip.tsx
index 5d3e4fae97e..316eab6c0ae 100644
--- a/frontend/src/component/executiveDashboard/componentsChart/MetricsSummaryChart/MetricsChartTooltip/MetricsChartTooltip.tsx
+++ b/frontend/src/component/executiveDashboard/componentsChart/MetricsSummaryChart/MetricsChartTooltip/MetricsChartTooltip.tsx
@@ -36,24 +36,24 @@ const InfoLine = ({
 );
 
 const InfoSummary = ({ data }: { data: { key: string; value: number }[] }) => (
-    <Typography variant={'body1'} component={'p'}>
-        <Box display={'flex'} flexDirection={'row'}>
-            {data.map(({ key, value }) => (
-                <div style={{ flex: 1, flexDirection: 'column' }}>
-                    <div
-                        style={{
-                            flex: 1,
-                            textAlign: 'center',
-                            marginBottom: '4px',
-                        }}
-                    >
+    <Box display={'flex'} flexDirection={'row'}>
+        {data.map(({ key, value }) => (
+            <div style={{ flex: 1, flexDirection: 'column' }} key={key}>
+                <div
+                    style={{
+                        flex: 1,
+                        textAlign: 'center',
+                        marginBottom: '4px',
+                    }}
+                >
+                    <Typography variant={'body1'} component={'p'}>
                         {key}
-                    </div>
-                    <div style={{ flex: 1, textAlign: 'center' }}>{value}</div>
+                    </Typography>
                 </div>
-            ))}
-        </Box>
-    </Typography>
+                <div style={{ flex: 1, textAlign: 'center' }}>{value}</div>
+            </div>
+        ))}
+    </Box>
 );
 
 export const MetricsSummaryTooltip: VFC<{ tooltip: TooltipState | null }> = ({
diff --git a/frontend/src/component/executiveDashboard/componentsChart/UpdatesPerEnvironmentTypeChart/UpdatesPerEnvironmentTypeChartTooltip/UpdatesPerEnvironmentTypeChartTooltip.tsx b/frontend/src/component/executiveDashboard/componentsChart/UpdatesPerEnvironmentTypeChart/UpdatesPerEnvironmentTypeChartTooltip/UpdatesPerEnvironmentTypeChartTooltip.tsx
index 8c6c9406cbb..8f5c9337f0c 100644
--- a/frontend/src/component/executiveDashboard/componentsChart/UpdatesPerEnvironmentTypeChart/UpdatesPerEnvironmentTypeChartTooltip/UpdatesPerEnvironmentTypeChartTooltip.tsx
+++ b/frontend/src/component/executiveDashboard/componentsChart/UpdatesPerEnvironmentTypeChart/UpdatesPerEnvironmentTypeChartTooltip/UpdatesPerEnvironmentTypeChartTooltip.tsx
@@ -39,7 +39,7 @@ const InfoSummary = ({ data }: { data: { key: string; value: number }[] }) => (
     <Typography variant={'body1'} component={'p'}>
         <Box display={'flex'} flexDirection={'row'}>
             {data.map(({ key, value }) => (
-                <div style={{ flex: 1, flexDirection: 'column' }}>
+                <div style={{ flex: 1, flexDirection: 'column' }} key={key}>
                     <div
                         style={{
                             flex: 1,