diff --git a/src/cover-hero.tsx b/src/cover-hero.tsx
index ce8e29dee..08520b28e 100644
--- a/src/cover-hero.tsx
+++ b/src/cover-hero.tsx
@@ -156,7 +156,7 @@ const CoverHero = React.forwardRef<HTMLDivElement, CoverHeroProps>(
                         </div>
                     )}
                 </Stack>
-                <div data-testid="slot">{extra}</div>
+                {extra && <div data-testid="slot">{extra}</div>}
             </div>
         );
 
diff --git a/src/header.tsx b/src/header.tsx
index 0f4a0e128..ff6a237eb 100644
--- a/src/header.tsx
+++ b/src/header.tsx
@@ -72,7 +72,7 @@ export const Header = ({
             {(title || pretitle || description) && (
                 <Box paddingRight={16}>
                     <Stack space={8}>
-                        <div data-testid="headline">{headline}</div>
+                        {headline && <div data-testid="headline">{headline}</div>}
                         {renderPretitle()}
                         {title &&
                             (small ? (