diff --git a/src/components/AssetTreeTable/index.vue b/src/components/AssetTreeTable/index.vue
index 508a6066a..73c2f6f6d 100644
--- a/src/components/AssetTreeTable/index.vue
+++ b/src/components/AssetTreeTable/index.vue
@@ -161,6 +161,8 @@ export default {
       } else if (treeNode.meta.type === 'platform') {
         url = setUrlParam(url, 'platform', treeNode.id)
       }
+      const query = this.setTreeUrlQuery()
+      url = query ? `${url}&${query}` : url
       this.$set(this.tableConfig, 'url', url)
       setRouterQuery(this, url)
     }
diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue
index 73ae66649..9848a3aa4 100644
--- a/src/views/assets/Domain/DomainCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainCreateUpdate.vue
@@ -27,6 +27,9 @@ export default {
             baseUrl: '/api/v1/assets/assets/?domain_enabled=true',
             treeUrlQuery: {
               domain_enabled: true
+            },
+            canSelect: (row) => {
+              return row.platform?.name !== 'Gateway'
             }
           }
         }