diff --git a/packages/base/src/formbuilder/editform.tsx b/packages/base/src/formbuilder/editform.tsx
index a13668147..ef1fd76ab 100644
--- a/packages/base/src/formbuilder/editform.tsx
+++ b/packages/base/src/formbuilder/editform.tsx
@@ -95,7 +95,7 @@ export class EditForm extends React.Component<IEditFormProps, any> {
           <div>
             <h3 style={{ paddingLeft: '5px' }}>Layer Properties</h3>
             <LayerForm
-              key={`${this.props.layer}-${source?.type}`} // Force remount when source type changes
+              key={`${this.props.layer}-${source?.type}`}
               formContext="update"
               sourceType={source?.type || 'RasterSource'}
               model={this.props.model}
@@ -112,7 +112,7 @@ export class EditForm extends React.Component<IEditFormProps, any> {
           <div>
             <h3 style={{ paddingLeft: '5px' }}>Source Properties</h3>
             <SourceForm
-              key={`${this.props.source}-${layer?.type}`} // Force remount when layer type changes
+              key={`${this.props.source}-${layer?.type}`}
               formContext="update"
               model={this.props.model}
               filePath={this.props.model.filePath}
diff --git a/packages/base/src/formbuilder/objectform/baseform.tsx b/packages/base/src/formbuilder/objectform/baseform.tsx
index e0b01f72d..3b7e6b409 100644
--- a/packages/base/src/formbuilder/objectform/baseform.tsx
+++ b/packages/base/src/formbuilder/objectform/baseform.tsx
@@ -89,6 +89,9 @@ const WrappedFormComponent: React.FC<any> = props => {
  * It will be up to the user of this class to actually perform the creation/edit using syncdata.
  */
 export class BaseForm extends React.Component<IBaseFormProps, IBaseFormStates> {
+  /** Skip syncData for the initial onChange (RJSF populating form), only sync on user edits. */
+  private isInitialLoadRef = true;
+
   constructor(props: IBaseFormProps) {
     super(props);
     this.currentFormData = deepCopy(this.props.sourceData);
@@ -106,6 +109,7 @@ export class BaseForm extends React.Component<IBaseFormProps, IBaseFormStates> {
       this.currentFormData = deepCopy(this.props.sourceData);
       const schema = deepCopy(this.props.schema);
       this.setState(old => ({ ...old, schema }));
+      this.isInitialLoadRef = true;
     }
   }
 
@@ -287,7 +291,11 @@ export class BaseForm extends React.Component<IBaseFormProps, IBaseFormStates> {
       this.props.formErrorSignal.emit(extraErrors);
     }
     if (this.props.formContext === 'update') {
-      this.syncData(this.currentFormData);
+      if (!this.isInitialLoadRef) {
+        this.syncData(this.currentFormData);
+      } else {
+        this.isInitialLoadRef = false;
+      }
     }
   }