diff --git a/ecc/blocks/registration-details-component/controller.js b/ecc/blocks/registration-details-component/controller.js
index 9eebfd02..749c79a1 100644
--- a/ecc/blocks/registration-details-component/controller.js
+++ b/ecc/blocks/registration-details-component/controller.js
@@ -222,12 +222,12 @@ function updateHeadingTooltip(component) {
 
 export async function onPayloadUpdate(component, props) {
   const { cloudType, eventType } = props.payload;
-  if (eventType && eventType !== component.dataset.eventType) {
-    component.dataset.eventType = eventType;
-  }
+  const eventTypeChange = eventType && eventType !== component.dataset.eventType;
+  const cloudTypeChange = cloudType && cloudType !== component.dataset.cloudType;
 
-  if (cloudType && cloudType !== component.dataset.cloudType) {
-    component.dataset.cloudType = cloudType;
+  if (eventTypeChange) component.dataset.eventType = eventType;
+  if (eventTypeChange) component.dataset.cloudType = cloudType;
+  if (cloudTypeChange || eventTypeChange) {
     const registrationConfigsWrapper = component.querySelector('.registration-configs-wrapper');
 
     if (!registrationConfigsWrapper) return;
@@ -252,19 +252,6 @@ export async function onPayloadUpdate(component, props) {
     }
 
     updateHeadingTooltip(component);
-  } else if (eventType && eventType !== component.dataset.eventType) {
-    if (cloudType === 'ExperienceCloud') {
-      switch (eventType) {
-        case 'InPerson':
-          buildExperienceCloudInPersonFields(component);
-          break;
-        case 'Webinar':
-          buildExperienceCloudWebinarFields(component);
-          break;
-        default:
-          break;
-      }
-    }
   }
 }