diff --git a/src/routes/metadata/list.js b/src/routes/metadata/list.js
index 3358350f..784a36b4 100644
--- a/src/routes/metadata/list.js
+++ b/src/routes/metadata/list.js
@@ -27,6 +27,10 @@ function getUsedModel() {
     priceConfig: { },
   };
   const query = {
+    where: {
+      deletedAt: { $eq: null },
+      disabled: false,
+    },
     attributes: { exclude: ['deletedAt', 'deletedBy'] },
     raw: true,
   };
diff --git a/src/routes/productTemplates/list.js b/src/routes/productTemplates/list.js
index d34f7d3e..c72c50ca 100644
--- a/src/routes/productTemplates/list.js
+++ b/src/routes/productTemplates/list.js
@@ -14,7 +14,7 @@ module.exports = [
     if (!util.isValidFilter(filters, ['productKey'])) {
       return util.handleError('Invalid filters', null, req, next);
     }
-    const where = { deletedAt: { $eq: null } };
+    const where = { deletedAt: { $eq: null }, disabled: false };
     if (filters.productKey) {
       where.productKey = { $eq: filters.productKey };
     }
diff --git a/src/routes/productTemplates/list.spec.js b/src/routes/productTemplates/list.spec.js
index d872be8e..9bd95b26 100644
--- a/src/routes/productTemplates/list.spec.js
+++ b/src/routes/productTemplates/list.spec.js
@@ -51,7 +51,7 @@ describe('LIST product templates', () => {
         },
         alias2: [1, 2, 3],
       },
-      disabled: true,
+      disabled: false,
       hidden: true,
       isAddOn: true,
       template: {
diff --git a/src/routes/projectTemplates/list.js b/src/routes/projectTemplates/list.js
index 3e83f2e4..09a8f7bf 100644
--- a/src/routes/projectTemplates/list.js
+++ b/src/routes/projectTemplates/list.js
@@ -12,6 +12,7 @@ module.exports = [
   (req, res, next) => models.ProjectTemplate.findAll({
     where: {
       deletedAt: { $eq: null },
+      disabled: false,
     },
     attributes: { exclude: ['deletedAt', 'deletedBy'] },
     raw: true,
diff --git a/src/routes/projectTemplates/list.spec.js b/src/routes/projectTemplates/list.spec.js
index 2da743c5..3971aa3b 100644
--- a/src/routes/projectTemplates/list.spec.js
+++ b/src/routes/projectTemplates/list.spec.js
@@ -20,7 +20,7 @@ describe('LIST project templates', () => {
       question: 'question 1',
       info: 'info 1',
       aliases: ['key-1', 'key_1'],
-      disabled: true,
+      disabled: false,
       hidden: true,
       scope: {
         scope1: {