diff --git a/plugins/tracker-resources/src/components/issues/Move.svelte b/plugins/tracker-resources/src/components/issues/Move.svelte
index 7f942c91be..b227b024d4 100644
--- a/plugins/tracker-resources/src/components/issues/Move.svelte
+++ b/plugins/tracker-resources/src/components/issues/Move.svelte
@@ -161,8 +161,6 @@
   $: if (keepOriginalAttribytes) {
     setOriginalAttributes()
   } else if (currentSpace !== undefined) {
-    statusToUpdate = {}
-    componentToUpdate = {}
     setReplacementAttributres(currentSpace)
   }
 
@@ -361,7 +359,18 @@
         props: { label: tracker.string.KeepOriginalAttributesTooltip }
       }}
     >
-      <div class="mr-2"><Toggle disabled={!isManageAttributesAvailable} bind:on={keepOriginalAttribytes} /></div>
+      <div class="mr-2">
+        <Toggle
+          disabled={!isManageAttributesAvailable}
+          on:change={() => {
+            keepOriginalAttribytes = !keepOriginalAttribytes
+            if (!keepOriginalAttribytes) {
+              statusToUpdate = {}
+              componentToUpdate = {}
+            }
+          }}
+        />
+      </div>
       <Label label={tracker.string.KeepOriginalAttributes} />
     </div>
     <div class="buttons">
diff --git a/plugins/tracker-resources/src/components/issues/move/SelectReplacement.svelte b/plugins/tracker-resources/src/components/issues/move/SelectReplacement.svelte
index 2f6bf3db62..0fac5c69cd 100644
--- a/plugins/tracker-resources/src/components/issues/move/SelectReplacement.svelte
+++ b/plugins/tracker-resources/src/components/issues/move/SelectReplacement.svelte
@@ -156,7 +156,10 @@
                       if (value !== undefined) {
                         const createComponent = typeof value === 'object'
                         const c = createComponent ? value.create : value
-                        statusToUpdate = { ...statusToUpdate, [component._id]: { ref: c, create: createComponent } }
+                        componentToUpdate = {
+                          ...componentToUpdate,
+                          [component._id]: { ref: c, create: createComponent }
+                        }
                       }
                     }
                   )