diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.ts
index 120bc501a4c..d623a600e40 100644
--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.ts
@@ -85,7 +85,17 @@ export class GlobalWorkspaceDataSource extends DataSource {
     const context = getWorkspaceContext();
     const { entityMetadatas } = context;
 
-    return entityMetadatas.find((metadata) => metadata.target === target);
+    return entityMetadatas.find((metadata) => {
+      if (metadata.target === target) {
+        return true;
+      }
+
+      if (typeof target === 'string') {
+        return metadata.tableName === target || metadata.name === target;
+      }
+
+      return false;
+    });
   }
 
   override getMetadata(target: EntityTarget<ObjectLiteral>): EntityMetadata {