diff --git a/Resources/Private/Fusion/Component/Attributes.fusion b/Resources/Private/Fusion/Component/Attributes.fusion
index 017e47a..e62f976 100644
--- a/Resources/Private/Fusion/Component/Attributes.fusion
+++ b/Resources/Private/Fusion/Component/Attributes.fusion
@@ -6,17 +6,17 @@ prototype(Jonnitto.PrettyEmbedVideoPlatforms:Component.Attributes) < prototype(N
             modifier = Neos.Fusion:DataStructure {
                 platform = ${props.platform}
                 iframe = true
-                ratio = ${!!props.force16to9 || !!props.hasRatioAndNoLightboxWithPreserveAspectRatio}
+                ratio = ${props.hasLightboxWithPreserveAspectRatio ? null : !!props.finalRatio}
                 look = ${props.look}
             }
         }
         href = ${String.replace(props.url.href, '%id%', props.videoID)}
         rel = 'noopener'
         target = '_blank'
-        style = ${props.force16to9 || props.hasRatioAndNoLightboxWithPreserveAspectRatio ? 'padding-top:' + props.forceRatio : null}
+        style = ${!props.hasLightboxWithPreserveAspectRatio && props.finalRatio ? 'padding-top:' + props.finalRatio : null}
         aria-label = ${props.metadataTitle}
         data-gdpr = ${props.enableGdprMessage && props.gdprMessage ? props.gdprMessage : null}
-        data-ratio = ${props.forceRatio || null}
+        data-ratio = ${props.finalRatio || null}
         data-fs = ${!!props.allowFullScreen}
         data-embed = Neos.Fusion:Case {
             isVimeo {
diff --git a/Resources/Private/Fusion/Component/Video/Video.fusion b/Resources/Private/Fusion/Component/Video/Video.fusion
index be514c7..36ad4a1 100644
--- a/Resources/Private/Fusion/Component/Video/Video.fusion
+++ b/Resources/Private/Fusion/Component/Video/Video.fusion
@@ -60,8 +60,8 @@ prototype(Jonnitto.PrettyEmbedVideoPlatforms:Component.Video) < prototype(Neos.F
     isYouTube = ${this.platform == 'youtube'}
     look = ${this.lightbox ? 'lightbox' : 'inline'}
     url = ${this.isYouTube ? this.configuration.youtube[this.type] : this.configuration[this.platform]}
-    hasRatioAndNoLightboxWithPreserveAspectRatio = ${this.lightbox && this.preserveAspectRatio ? false : !!this.ratio}
-    forceRatio = ${Jonnitto.PrettyEmbedHelper.paddingTop(this.ratio || this.force16to9)}
+    hasLightboxWithPreserveAspectRatio = ${this.lightbox && this.preserveAspectRatio}
+    finalRatio = ${Jonnitto.PrettyEmbedHelper.paddingTop(this.ratio || this.force16to9)}
 
     previewImageClass = ${!this.poster && this.isYouTube ? 'jonnitto-prettyembed__youtube-preview' : null}
     posterFromYoutube = ${this.isYouTube && this.type == 'video' && !this.poster ? '//i.ytimg.com/vi/' + this.videoID + '/maxresdefault.jpg' : null}