diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index 34a5d88e0..b2a508ba9 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -83,7 +83,7 @@ export default {
     async setInitial() {
       const { defaultConfig } = this
       const { node, platform } = this.$route?.query || {}
-      const nodesInitial = node || []
+      const nodesInitial = node ? [node] : []
       const platformId = platform || 1
       const url = `/api/v1/assets/platforms/${platformId}/`
       this.platform = await this.$axios.get(url)
diff --git a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
index cd351fa6b..98d05e706 100644
--- a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
+++ b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
@@ -150,7 +150,12 @@ export default {
       const route = _.capitalize(platform.category.value) + 'Create' || 'HostCreate'
       this.addToRecentPlatforms(platform)
       this.iVisible = false
-      this.$router.push({ name: route, query: { platform: platform.id }})
+      const query = {
+        node: this.$route.query?.node || '',
+        platform: platform.id
+      }
+
+      this.$router.push({ name: route, query })
     }
   }
 }