diff --git a/ui-v2/app/components/child-selector/index.js b/ui-v2/app/components/child-selector/index.js
index c1f58ef5b8..b3b498b979 100644
--- a/ui-v2/app/components/child-selector/index.js
+++ b/ui-v2/app/components/child-selector/index.js
@@ -76,9 +76,13 @@ export default Component.extend(SlotsMixin, WithListeners, {
             items,
             e.data,
           ]);
+          item.willDestroy();
           success();
         },
-        error: e => this.error(e),
+        error: e => {
+          item.willDestroy();
+          this.error(e);
+        },
       });
     },
     remove: function(item, items) {
diff --git a/ui-v2/app/components/policy-selector/index.hbs b/ui-v2/app/components/policy-selector/index.hbs
index 6e2b7198ac..ad4cac71a1 100644
--- a/ui-v2/app/components/policy-selector/index.hbs
+++ b/ui-v2/app/components/policy-selector/index.hbs
@@ -59,7 +59,7 @@
       <BlockSlot @name="details">
           {{#if (eq item.template '')}}
             <DataSource
-              @src={{concat '/' item.Namespace '/' item.Datacenter '/policy/' item.ID}}
+              @src={{concat '/' item.Namespace '/' dc '/policy/' item.ID}}
               @onchange={{action (mut loadedItem) value="data"}}
               @loading="lazy"
             />