diff --git a/ui/src/components/view/ImageDeployInstanceButton.vue b/ui/src/components/view/ImageDeployInstanceButton.vue
index b2d4b55bc6a3..2cdd5a0af460 100644
--- a/ui/src/components/view/ImageDeployInstanceButton.vue
+++ b/ui/src/components/view/ImageDeployInstanceButton.vue
@@ -71,9 +71,14 @@ export default {
     if (this.$route.meta.name === 'iso') {
       this.imageApi = 'listIsos'
     }
-    setTimeout(() => {
-      this.fetchData()
-    }, 100)
+    this.fetchData()
+  },
+  watch: {
+    resource (newValue) {
+      if (newValue?.id) {
+        this.fetchData()
+      }
+    }
   },
   computed: {
     allowed () {
@@ -82,23 +87,22 @@ export default {
     }
   },
   methods: {
-    arrayHasItems (array) {
-      return array !== null && array !== undefined && Array.isArray(array) && array.length > 0
-    },
     fetchData () {
       this.fetchResourceData()
     },
     fetchResourceData () {
-      const params = {}
-      params.id = this.resource.id
-      params.templatefilter = 'executable'
-      params.listall = true
-      params.page = this.page
-      params.pagesize = this.pageSize
+      if (!this.resource || !this.resource.id) {
+        return
+      }
+      const params = {
+        id: this.resource.id,
+        templatefilter: 'executable',
+        listall: true
+      }
 
       this.dataSource = []
       this.itemCount = 0
-      this.fetchLoading = true
+      this.loading = true
       this.zones = []
       getAPI(this.imageApi, params).then(json => {
         const imageResponse = json?.[this.imageApi.toLowerCase() + 'response']?.[this.$route.meta.name] || []
@@ -108,8 +112,8 @@ export default {
         }))
       }).catch(error => {
         this.$notifyError(error)
-        this.loading = false
       }).finally(() => {
+        this.loading = false
         if (this.zones.length !== 0) {
           this.$emit('update-zones', this.zones)
         }
@@ -122,7 +126,8 @@ export default {
       }
       const zoneids = this.zones.map(z => z.id)
       this.loading = true
-      getAPI('listZones', { showicon: true, ids: zoneids.join(',') }).then(json => {
+      const params = { showicon: true, ids: zoneids.join(',') }
+      getAPI('listZones', params).then(json => {
         this.zones = json.listzonesresponse.zone || []
       }).finally(() => {
         this.loading = false