diff --git a/packages/ui/src/views/agentexecutions/ExecutionDetails.jsx b/packages/ui/src/views/agentexecutions/ExecutionDetails.jsx
index 90fbc18a0..c89a1130f 100644
--- a/packages/ui/src/views/agentexecutions/ExecutionDetails.jsx
+++ b/packages/ui/src/views/agentexecutions/ExecutionDetails.jsx
@@ -725,7 +725,8 @@ export const ExecutionDetails = ({ open, isPublic, execution, metadata, onClose,
                     flex: '1 1 35%',
                     padding: 2,
                     borderRight: 1,
-                    borderColor: 'divider'
+                    borderColor: 'divider',
+                    overflow: 'auto'
                 }}
             >
                 <Box
diff --git a/packages/ui/src/views/agentexecutions/PublicExecutionDetails.jsx b/packages/ui/src/views/agentexecutions/PublicExecutionDetails.jsx
index b2c95c6ae..ed650ac29 100644
--- a/packages/ui/src/views/agentexecutions/PublicExecutionDetails.jsx
+++ b/packages/ui/src/views/agentexecutions/PublicExecutionDetails.jsx
@@ -10,7 +10,7 @@ import executionsApi from '@/api/executions'
 import useApi from '@/hooks/useApi'
 
 // MUI
-import { Box, Card, Stack, Typography, useTheme } from '@mui/material'
+import { Box, Card, Stack, Typography, useTheme, CircularProgress } from '@mui/material'
 import { IconCircleXFilled } from '@tabler/icons-react'
 import { alpha } from '@mui/material/styles'
 
@@ -56,9 +56,13 @@ const PublicExecutionDetails = () => {
 
     return (
         <>
-            {!isLoading ? (
+            {isLoading ? (
+                <Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '80vh' }}>
+                    <CircularProgress size={60} />
+                </Box>
+            ) : (
                 <>
-                    {!execution || getExecutionByIdPublicApi.error ? (
+                    {getExecutionByIdPublicApi.error ? (
                         <Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '80vh' }}>
                             <Box sx={{ maxWidth: '500px', width: '100%' }}>
                                 <Card
@@ -96,7 +100,7 @@ const PublicExecutionDetails = () => {
                         />
                     )}
                 </>
-            ) : null}
+            )}
         </>
     )
 }