diff --git a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/aemform.html b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/aemform.html
index b0e55d34b1..90cdf0164e 100644
--- a/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/aemform.html
+++ b/ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/aemform.html
@@ -68,15 +68,12 @@
 <sly data-sly-use.clientLib="${'/libs/granite/sightly/templates/clientlib.html'}"/>
 <sly data-sly-test.useIframe="${form.useIframe != 'false'}">
     <sly data-sly-test.formLocaleString="${form.locale || 'en'}"/>
-    <sly data-sly-set.dataRef="${request.requestParameterMap['dataRef'] ? request.requestParameterMap['dataRef'][0].toString :'' @ context='attribute'}"/>
-    <sly data-sly-set.wcmmode="${!wcmmode.edit?'wcmmode=DISABLED':''}"/>
-    <sly data-sly-set.formUrlParams="${wcmmode ? '?':''}${wcmmode}${dataRef ? '&dataRef=' :''}${dataRef}"/>
-     <iframe title="${form.title}"
-             role="${form.roleAttribute || ''}"
-             class="cmp-aemform__iframecontent"
-                src="${request.contextPath}${resource.path}.iframe.${formLocaleString}.html${formUrlParams}"
-                width="100%;"
-                data-form-page-path="${form.formEditPagePath}"></iframe>
+        <iframe title="${form.title}"
+                role="${form.roleAttribute || ''}"
+                class="cmp-aemform__iframecontent"
+            src="${request.contextPath}${resource.path}.iframe.${formLocaleString}.html?dataRef=${request.requestParameterMap['dataRef'] != null ? request.requestParameterMap['dataRef'][0].toString : '' @ context='attribute'}${!wcmmode.edit ? '&wcmmode={0}':'' @ format=[wcmmode.toString]}"
+            width="100%;"
+            data-form-page-path="${form.formEditPagePath}"></iframe>
     <sly data-sly-test="${form.useIframe != 'false' && form.height == 'auto'}"
          data-sly-call="${clientLib.all @ categories=['core.forms.components.aemform.v2.iframeResizer']}"/>
 </sly>
diff --git a/ui.tests/test-module/specs/aemEmbedContainer/aemEmbedContainer.runtime.spec.js b/ui.tests/test-module/specs/aemEmbedContainer/aemEmbedContainer.runtime.spec.js
index f9b4e87dbb..2d02ff9d3f 100644
--- a/ui.tests/test-module/specs/aemEmbedContainer/aemEmbedContainer.runtime.spec.js
+++ b/ui.tests/test-module/specs/aemEmbedContainer/aemEmbedContainer.runtime.spec.js
@@ -48,15 +48,6 @@ describe("Sites with Aem Embed Container", () => {
             cy.get('.cmp-adaptiveform-container').should('have.length', 1);
             cy.get('.cmp-adaptiveform-container').find('.cmp-adaptiveform-textinput__widget').should('have.length', 11);
         })
-
-        it('Test iframe src with dataRef', () => {
-            cy.visit(pagePath+"?dataRef='testingDataRef'")
-            cy.get('.cmp-aemform__iframecontent').should('have.attr', 'src').should('include', "?wcmmode=DISABLED&dataRef='testingDataRef'");
-          });
-
-          it('Test iframe src without dataRef', () => {
-            cy.get('.cmp-aemform__iframecontent').should('have.attr', 'src').should('include', "?wcmmode=DISABLED");
-          });
     })
 
     context('aem embed container in iframe mode with custom height ', function () {