diff --git a/src/DonationForms/Blocks/DonationFormBlock/Controllers/BlockRenderController.php b/src/DonationForms/Blocks/DonationFormBlock/Controllers/BlockRenderController.php
index 81462124ff..4279f412fd 100644
--- a/src/DonationForms/Blocks/DonationFormBlock/Controllers/BlockRenderController.php
+++ b/src/DonationForms/Blocks/DonationFormBlock/Controllers/BlockRenderController.php
@@ -104,14 +104,6 @@ private function getFormViewUrl(DonationForm $donationForm): string
      */
     protected function loadEmbedScript()
     {
-        (new EnqueueScript(
-            'givewp-donation-form-embed',
-            'build/donationFormEmbed.js',
-            GIVE_PLUGIN_DIR,
-            GIVE_PLUGIN_URL,
-            'give'
-        ))->loadInFooter()->enqueue();
-
         (new EnqueueScript(
             'givewp-donation-form-embed-app',
             'build/donationFormBlockApp.js',
diff --git a/src/DonationForms/Blocks/DonationFormBlock/resources/app/Components/ModalForm.tsx b/src/DonationForms/Blocks/DonationFormBlock/resources/app/Components/ModalForm.tsx
index 397c1bf908..22d7e0026d 100644
--- a/src/DonationForms/Blocks/DonationFormBlock/resources/app/Components/ModalForm.tsx
+++ b/src/DonationForms/Blocks/DonationFormBlock/resources/app/Components/ModalForm.tsx
@@ -42,6 +42,7 @@ export default function ModalForm({dataSrc, embedId, openFormButton, isFormRedir
                 id={embedId}
                 src={dataSrcUrl}
                 checkOrigin={false}
+                heightCalculationMethod={'taggedElement'}
                 style={{
                     minWidth: '100%',
                     border: 'none',
diff --git a/src/DonationForms/Blocks/DonationFormBlock/resources/app/index.tsx b/src/DonationForms/Blocks/DonationFormBlock/resources/app/index.tsx
index 32d8d4fbca..27f11daff9 100644
--- a/src/DonationForms/Blocks/DonationFormBlock/resources/app/index.tsx
+++ b/src/DonationForms/Blocks/DonationFormBlock/resources/app/index.tsx
@@ -73,6 +73,7 @@ function DonationFormBlockApp({
             id={embedId}
             src={dataSrc}
             checkOrigin={false}
+            heightCalculationMethod={'taggedElement'}
             style={{
                 width: '1px',
                 minWidth: '100%',