diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-index-metadata/services/workspace-flat-index-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-index-metadata/services/workspace-flat-index-map-cache.service.ts
index 00615cb4699..bf4c4808970 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-index-metadata/services/workspace-flat-index-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-index-metadata/services/workspace-flat-index-map-cache.service.ts
@@ -52,6 +52,7 @@ export class WorkspaceFlatIndexMapCacheService extends WorkspaceCacheProvider<
               indexMetadataId: true,
               fieldMetadataId: true,
               order: true,
+              subFieldName: true,
               createdAt: true,
               updatedAt: true,
             },
diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts
index c8b49f393f7..581facabca4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-field-metadata.entity.ts
@@ -10,9 +10,10 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
+import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
+import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
-import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 
 @Entity({ name: 'indexFieldMetadata', schema: 'core' })
 export class IndexFieldMetadataEntity implements Required<IndexFieldMetadataEntity> {
@@ -60,6 +61,10 @@ export class IndexFieldMetadataEntity implements Required<IndexFieldMetadataEnti
   // Null for scalar/relation fields. Set to the composite sub-property name
   // (e.g. 'addressCity') when the index targets a single column of a
   // composite-type parent.
+  @WasIntroducedInUpgrade({
+    upgradeCommandName:
+      '2.8.0_AddSubFieldNameToIndexFieldMetadataFastInstanceCommand_1798200000000',
+  })
   @Column({ type: 'text', nullable: true })
   subFieldName: string | null;