diff --git a/src/blocks/FDVideoHeroBlock/Component.tsx b/src/blocks/FDVideoHeroBlock/Component.tsx
index e4acb64..8221902 100644
--- a/src/blocks/FDVideoHeroBlock/Component.tsx
+++ b/src/blocks/FDVideoHeroBlock/Component.tsx
@@ -56,7 +56,7 @@ export const FDVideoHeroBlockComponent: React.FC<FDVideoHeroBlockProps> = (props
     black: 'bg-black',
     navy: 'bg-fd-navy',
   }
-  const overlayClass = hasOverlay
+  const overlayClass = hasOverlay && overlayColor && overlayStrength
     ? `${overlayBgMap[overlayColor] || ''} ${overlayOpacityMap[overlayStrength] || 'opacity-50'}`
     : ''
 
@@ -71,7 +71,7 @@ export const FDVideoHeroBlockComponent: React.FC<FDVideoHeroBlockProps> = (props
     large: 'min-h-[80vh]',
     medium: 'min-h-[60vh]',
   }
-  const heightClass = heightMap[minHeight] || 'min-h-screen'
+  const heightClass = heightMap[minHeight || "screen"] || 'min-h-screen'
 
   // Text alignment
   const alignClass = textAlign === 'center' ? 'text-center items-center' : 'text-left items-start'