diff --git a/packages/core/database/lib/metadata/index.js b/packages/core/database/lib/metadata/index.js
index 96f6103c73..f68f1b1bd6 100644
--- a/packages/core/database/lib/metadata/index.js
+++ b/packages/core/database/lib/metadata/index.js
@@ -215,7 +215,7 @@ const createComponent = (attributeName, attribute, meta) => {
       orderBy: {
         order: 'asc',
       },
-      pivotColumns: ['entity_id', 'component_id', 'field'],
+      pivotColumns: ['entity_id', 'component_id', 'field', 'component_type'],
     },
   });
 };