diff --git a/lib/folders/index.js b/lib/folders/index.js
index <HASH>..<HASH> 100644
--- a/lib/folders/index.js
+++ b/lib/folders/index.js
@@ -24,6 +24,10 @@ module.exports = (reporter) => {
   // before document store initialization, extend all entity types with folder information

   reporter.documentStore.on('before-init', (documentStore) => {

     Object.entries(documentStore.model.entitySets).forEach(([k, entitySet]) => {

+      if (entitySet.splitIntoDirectories !== true) {

+        return

+      }

+

       const entityTypeName = entitySet.entityType.replace(documentStore.model.namespace + '.', '')

 

       documentStore.model.entityTypes[entityTypeName].folder = {
should not add folders property to entity sets that don’t need it