diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
index 4ede9e021..b1ee410d9 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
@@ -40,11 +40,11 @@ export class GraphqlQueryParser {
 
     const parsedFilter = graphqlQueryFilterParser.parse(recordFilter);
 
-    if (!('deletedAt' in this.fieldMetadataMap)) {
-      return parsedFilter;
-    }
+    // if (!('deletedAt' in this.fieldMetadataMap)) {
+    return parsedFilter;
+    // }
 
-    return this.addDefaultSoftDeleteCondition(parsedFilter);
+    // return this.addDefaultSoftDeleteCondition(parsedFilter);
   }
 
   private addDefaultSoftDeleteCondition(
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-one-resolver.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-one-resolver.service.ts
index 2cbfcb01f..f7bba35bb 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-one-resolver.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-one-resolver.service.ts
@@ -65,6 +65,7 @@ export class GraphqlQueryFindOneResolverService {
       where,
       select,
     })) as ObjectRecord;
+
     const limit = QUERY_MAX_RECORDS;
 
     if (!objectRecord) {
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
index db67298f1..a72fe08c7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
@@ -79,7 +79,6 @@ export class EntitySchemaColumnFactory {
         nullable: fieldMetadata.isNullable,
         createDate: key === 'createdAt',
         updateDate: key === 'updatedAt',
-        deleteDate: key === 'deletedAt',
         array: fieldMetadata.type === FieldMetadataType.MULTI_SELECT,
         default: defaultValue,
       };
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
index bee750bae..60aecca27 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
@@ -4,7 +4,6 @@ import { EntitySchema } from 'typeorm';
 
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { ObjectMetadataMap } from 'src/engine/metadata-modules/utils/generate-object-metadata-map.util';
 import { WorkspaceMetadataCacheService } from 'src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service';
 import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace.datasource';
 import {
@@ -36,13 +35,11 @@ export class WorkspaceDatasourceFactory {
     workspaceMetadataVersion: number | null,
     failOnMetadataCacheMiss = true,
   ): Promise<WorkspaceDataSource> {
-    const {
-      metadataVersion: cachedWorkspaceMetadataVersion,
-      objectMetadataMap: cachedObjectMetadataMap,
-    } = await this.getWorkspaceMetadataFromCache(
-      workspaceId,
-      failOnMetadataCacheMiss,
-    );
+    const cachedWorkspaceMetadataVersion =
+      await this.getWorkspaceMetadataVersionFromCache(
+        workspaceId,
+        failOnMetadataCacheMiss,
+      );
 
     if (
       workspaceMetadataVersion !== null &&
@@ -89,6 +86,19 @@ export class WorkspaceDatasourceFactory {
 
             let cachedEntitySchemas: EntitySchema[];
 
+            const cachedObjectMetadataMap =
+              await this.workspaceCacheStorageService.getObjectMetadataMap(
+                workspaceId,
+                cachedWorkspaceMetadataVersion,
+              );
+
+            if (!cachedObjectMetadataMap) {
+              throw new TwentyORMException(
+                `Workspace Schema not found for workspace ${workspaceId}`,
+                TwentyORMExceptionCode.METADATA_COLLECTION_NOT_FOUND,
+              );
+            }
+
             if (cachedEntitySchemaOptions) {
               cachedEntitySchemas = cachedEntitySchemaOptions.map(
                 (option) => new EntitySchema(option),
@@ -181,13 +191,10 @@ export class WorkspaceDatasourceFactory {
     );
   }
 
-  private async getWorkspaceMetadataFromCache(
+  private async getWorkspaceMetadataVersionFromCache(
     workspaceId: string,
     failOnMetadataCacheMiss = true,
-  ): Promise<{
-    metadataVersion: number;
-    objectMetadataMap: ObjectMetadataMap;
-  }> {
+  ): Promise<number> {
     let latestWorkspaceMetadataVersion =
       await this.workspaceCacheStorageService.getMetadataVersion(workspaceId);
 
@@ -217,22 +224,6 @@ export class WorkspaceDatasourceFactory {
       );
     }
 
-    const objectMetadataMap =
-      await this.workspaceCacheStorageService.getObjectMetadataMap(
-        workspaceId,
-        latestWorkspaceMetadataVersion,
-      );
-
-    if (!objectMetadataMap) {
-      throw new TwentyORMException(
-        `Object metadata map not found for workspace ${workspaceId}`,
-        TwentyORMExceptionCode.METADATA_COLLECTION_NOT_FOUND,
-      );
-    }
-
-    return {
-      metadataVersion: latestWorkspaceMetadataVersion,
-      objectMetadataMap,
-    };
+    return latestWorkspaceMetadataVersion;
   }
 }