diff --git a/packages/core/utils/src/dml/helpers/create-graphql.ts b/packages/core/utils/src/dml/helpers/create-graphql.ts
index bbe89174e7..0894c413a7 100644
--- a/packages/core/utils/src/dml/helpers/create-graphql.ts
+++ b/packages/core/utils/src/dml/helpers/create-graphql.ts
@@ -83,6 +83,8 @@ export const toGraphQLSchema = <T extends any[]>(entities: T): string => {
   })
 
   const defaultMedusaSchema = `
+    scalar DateTime
+    scalar JSON
     directive @enumValue(value: String) on ENUM_VALUE
   `
 
diff --git a/packages/modules/index/src/utils/build-config.ts b/packages/modules/index/src/utils/build-config.ts
index b8f99c9dde..dd924210bd 100644
--- a/packages/modules/index/src/utils/build-config.ts
+++ b/packages/modules/index/src/utils/build-config.ts
@@ -1253,7 +1253,10 @@ export function buildSchemaObjectRepresentation(schema: string): {
   } as IndexTypes.SchemaObjectRepresentation
 
   Object.entries(entitiesMap).forEach(([entityName, entityMapValue]) => {
-    if (!entityMapValue.astNode) {
+    if (
+      !entityMapValue.astNode ||
+      entityMapValue.astNode.kind === GraphQLUtils.Kind.SCALAR_TYPE_DEFINITION
+    ) {
       return
     }