diff --git a/addons/api/addon/serializers/host-set.js b/addons/api/addon/serializers/host-set.js
index 928e80d0c..613caf1ab 100644
--- a/addons/api/addon/serializers/host-set.js
+++ b/addons/api/addon/serializers/host-set.js
@@ -1,8 +1,8 @@
 import ApplicationSerializer from './application';
 
 const fieldByType = {
-  aws: ['filters'],
-  azure: ['filter'],
+  aws: ['preferred_endpoints', 'filters'],
+  azure: ['preferred_endpoints', 'filter'],
 };
 export default class HostSetSerializer extends ApplicationSerializer {
   // =properties
@@ -53,6 +53,7 @@ export default class HostSetSerializer extends ApplicationSerializer {
     let serialized = super.serialize(...arguments);
     // Delete unnecessary fields for static type
     delete serialized.attributes;
+    delete serialized.preferred_endpoints;
     return serialized;
   }
 
diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js
index cfda11aed..038bf6a7c 100644
--- a/addons/api/mirage/factories/host-set.js
+++ b/addons/api/mirage/factories/host-set.js
@@ -31,7 +31,7 @@ export default factory.extend({
   },
   // AWS specific
   filters() {
-    if (this.type === 'plugin' && this.plugin?.name === 'aws') {
+    if (this.plugin?.name === 'aws') {
       const filtersAmount = datatype.number({ min: 1, max: 5 });
       let result = [];
       for (let i = 0; i < filtersAmount; ++i) {
@@ -42,7 +42,7 @@ export default factory.extend({
   },
   // Azure specific
   filter() {
-    if (this.type === 'plugin' && this.plugin?.name === 'azure') {
+    if (this.plugin?.name === 'azure') {
       return `${database.column}=${database.collation}`;
     }
   },
diff --git a/addons/api/tests/unit/serializers/host-set-test.js b/addons/api/tests/unit/serializers/host-set-test.js
index 14714ef2b..edb98d519 100644
--- a/addons/api/tests/unit/serializers/host-set-test.js
+++ b/addons/api/tests/unit/serializers/host-set-test.js
@@ -13,14 +13,12 @@ module('Unit | Serializer | host set', function (hooks) {
       description: 'Description',
       host_catalog_id: '123',
       version: 1,
-      preferred_endpoints: [{ value: 'option 1' }, { value: 'option 2' }],
     });
     assert.deepEqual(record.serialize(), {
       name: 'Host Set 1',
       description: 'Description',
       host_catalog_id: '123',
       version: 1,
-      preferred_endpoints: ['option 1', 'option 2'],
     });
   });